korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-09-22 12:44:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Phonet: handle rtnetlink registration failure

Browse Source 
Signed-off-by: Rémi Denis-Courmont <remi.denis-courmont@nokia.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
remi.denis-courmont@nokia 2009-01-23 03:00:28 +00:00 committed by David S. Miller
parent 76e02cf694
commit 660f706d93
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/phonet/pn_dev.h
View File

@ -38,7 +38,7 @@ struct phonet_device {
int phonet_device_init(void);
void phonet_device_exit(void);
void phonet_netlink_register(void);
int phonet_netlink_register(void);
struct net_device *phonet_device_get(struct net *net);
int phonet_address_add(struct net_device *dev, u8 addr);

8
net/phonet/pn_dev.c
View File

@ -190,9 +190,13 @@ static struct notifier_block phonet_device_notifier = {
/* Initialize Phonet devices list */
int __init phonet_device_init(void)
{
int err;
register_netdevice_notifier(&phonet_device_notifier);
phonet_netlink_register();
return 0;
err = phonet_netlink_register();
if (err)
phonet_device_exit();
return err;
}
void phonet_device_exit(void)

13
net/phonet/pn_netlink.c
View File

@ -160,9 +160,14 @@ out:
return skb->len;
}
void __init phonet_netlink_register(void)
int __init phonet_netlink_register(void)
{
rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
int err = __rtnl_register(PF_PHONET, RTM_NEWADDR, addr_doit, NULL);
if (err)
return err;
/* Further __rtnl_register() cannot fail */
__rtnl_register(PF_PHONET, RTM_DELADDR, addr_doit, NULL);
__rtnl_register(PF_PHONET, RTM_GETADDR, NULL, getaddr_dumpit);
return 0;
}