Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1244 commits)
  pkt_sched: Rename PSCHED_US2NS and PSCHED_NS2US
  ipv4: Fix fib_trie rebalancing
  Bluetooth: Fix issue with uninitialized nsh.type in DTL-1 driver
  Bluetooth: Fix Kconfig issue with RFKILL integration
  PIM-SM: namespace changes
  ipv4: update ARPD help text
  net: use a deferred timer in rt_check_expire
  ieee802154: fix kconfig bool/tristate muckup
  bonding: initialization rework
  bonding: use is_zero_ether_addr
  bonding: network device names are case sensative
  bonding: elminate bad refcount code
  bonding: fix style issues
  bonding: fix destructor
  bonding: remove bonding read/write semaphore
  bonding: initialize before registration
  bonding: bond_create always called with default parameters
  x_tables: Convert printk to pr_err
  netfilter: conntrack: optional reliable conntrack event delivery
  list_nulls: add hlist_nulls_add_head and hlist_nulls_del
  ...

1 files changed, 16 insertions, 22 deletions

diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c
index c387217bb230..3c57005e44d1 100644
--- a/net/tipc/netlink.c
+++ b/net/tipc/netlink.c
@@ -68,7 +68,7 @@ static int handle_cmd(struct sk_buff *skb, struct genl_info *info)
         return 0;
 }
 
-static struct genl_family family = {
+static struct genl_family tipc_genl_family = {
         .id             = GENL_ID_GENERATE,
         .name           = TIPC_GENL_NAME,
         .version        = TIPC_GENL_VERSION,
@@ -76,39 +76,33 @@ static struct genl_family family = {
         .maxattr        = 0,
 };
 
-static struct genl_ops ops = {
+static struct genl_ops tipc_genl_ops = {
         .cmd            = TIPC_GENL_CMD,
         .doit           = handle_cmd,
 };
 
-static int family_registered = 0;
+static int tipc_genl_family_registered;
 
 int tipc_netlink_start(void)
 {
+        int res;
 
+        res = genl_register_family_with_ops(&tipc_genl_family,
+                &tipc_genl_ops, 1);
+        if (res) {
+                err("Failed to register netlink interface\n");
+                return res;
+        }
 
-        if (genl_register_family(&family))
-                goto err;
-
-        family_registered = 1;
-
-        if (genl_register_ops(&family, &ops))
-                goto err_unregister;
-
+        tipc_genl_family_registered = 1;
         return 0;
-
- err_unregister:
-        genl_unregister_family(&family);
-        family_registered = 0;
- err:
-        err("Failed to register netlink interface\n");
-        return -EFAULT;
 }
 
 void tipc_netlink_stop(void)
 {
-        if (family_registered) {
-                genl_unregister_family(&family);
-                family_registered = 0;
-        }
+        if (!tipc_genl_family_registered)
+                return;
+
+        genl_unregister_family(&tipc_genl_family);
+        tipc_genl_family_registered = 0;
 }