From 5eea6c24c3f38cf6ab5d0d35afab40f4de9a76c6 Mon Sep 17 00:00:00 2001 From: "remi.denis-courmont@nokia" Date: Fri, 23 Jan 2009 03:00:28 +0000 Subject: [PATCH] --- yaml --- r: 133911 b: refs/heads/master c: 660f706d931d4795d341805e083a8091af74fa88 h: refs/heads/master i: 133909: 49fc395f363ca02105cf03479e62e2c5d40fc90d 133907: b6ef06cd340eecd1ed0973ca7b525df7e3023041 133903: 50c052a702e834ec289df11dc2e1ea1cb052229f v: v3 --- [refs] | 2 +- trunk/include/net/phonet/pn_dev.h | 2 +- trunk/net/phonet/pn_dev.c | 8 ++++++-- trunk/net/phonet/pn_netlink.c | 13 +++++++++---- 4 files changed, 17 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 6c0f5fbdede9..7d1ba7bd5d1b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76e02cf6945e6faa9f6b546dc0513512197c5966 +refs/heads/master: 660f706d931d4795d341805e083a8091af74fa88 diff --git a/trunk/include/net/phonet/pn_dev.h b/trunk/include/net/phonet/pn_dev.h index 59ae628b1111..4ba2aedaa507 100644 --- a/trunk/include/net/phonet/pn_dev.h +++ b/trunk/include/net/phonet/pn_dev.h @@ -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); diff --git a/trunk/net/phonet/pn_dev.c b/trunk/net/phonet/pn_dev.c index af49db01d634..fd418107652b 100644 --- a/trunk/net/phonet/pn_dev.c +++ b/trunk/net/phonet/pn_dev.c @@ -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) diff --git a/trunk/net/phonet/pn_netlink.c b/trunk/net/phonet/pn_netlink.c index 242fe8f8c322..918a4f07f24a 100644 --- a/trunk/net/phonet/pn_netlink.c +++ b/trunk/net/phonet/pn_netlink.c @@ -160,9 +160,14 @@ static int getaddr_dumpit(struct sk_buff *skb, struct netlink_callback *cb) 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; }