iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IPV6]: make inet6_register_protosw to return an error code

Browse Source 
This patch makes the inet6_register_protosw to return an error code.
The different protocols can be aware the registration was successful or
not and can pass the error to the initial caller, af_inet6.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Lezcano 2007-12-11 02:25:01 -08:00 committed by David S. Miller
parent 853cbbaaa4
commit 87c3efbfdd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/protocol.h
View File

@ -102,7 +102,7 @@ extern void inet_unregister_protosw(struct inet_protosw *p);
#if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE) #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
extern int inet6_add_protocol(struct inet6_protocol *prot, unsigned char num); extern int inet6_add_protocol(struct inet6_protocol *prot, unsigned char num);
extern int inet6_del_protocol(struct inet6_protocol *prot, unsigned char num); extern int inet6_del_protocol(struct inet6_protocol *prot, unsigned char num);
extern void inet6_register_protosw(struct inet_protosw *p); extern int inet6_register_protosw(struct inet_protosw *p);
extern void inet6_unregister_protosw(struct inet_protosw *p); extern void inet6_unregister_protosw(struct inet_protosw *p);
#endif #endif

11
net/ipv6/af_inet6.c
View File

@ -565,21 +565,23 @@ static struct inet_protosw rawv6_protosw = {
.flags = INET_PROTOSW_REUSE, .flags = INET_PROTOSW_REUSE,
}; };
void int inet6_register_protosw(struct inet_protosw *p)
inet6_register_protosw(struct inet_protosw *p)
{ {
struct list_head *lh; struct list_head *lh;
struct inet_protosw *answer; struct inet_protosw *answer;
int protocol = p->protocol;
struct list_head *last_perm; struct list_head *last_perm;
int protocol = p->protocol;
int ret;
spin_lock_bh(&inetsw6_lock); spin_lock_bh(&inetsw6_lock);
ret = -EINVAL;
if (p->type >= SOCK_MAX) if (p->type >= SOCK_MAX)
goto out_illegal; goto out_illegal;
/* If we are trying to override a permanent protocol, bail. */ /* If we are trying to override a permanent protocol, bail. */
answer = NULL; answer = NULL;
ret = -EPERM;
last_perm = &inetsw6[p->type]; last_perm = &inetsw6[p->type];
list_for_each(lh, &inetsw6[p->type]) { list_for_each(lh, &inetsw6[p->type]) {
answer = list_entry(lh, struct inet_protosw, list); answer = list_entry(lh, struct inet_protosw, list);
@ -603,9 +605,10 @@ inet6_register_protosw(struct inet_protosw *p)
* system automatically returns to the old behavior. * system automatically returns to the old behavior.
*/ */
list_add_rcu(&p->list, last_perm); list_add_rcu(&p->list, last_perm);
ret = 0;
out: out:
spin_unlock_bh(&inetsw6_lock); spin_unlock_bh(&inetsw6_lock);
return; return ret;
out_permanent: out_permanent:
printk(KERN_ERR "Attempt to override permanent protocol %d.\n", printk(KERN_ERR "Attempt to override permanent protocol %d.\n",