19 files changed, 222 insertions, 123 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 92ebeca29901..3942266d1f6c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -126,6 +126,7 @@
 #include <linux/in.h>
 #include <linux/jhash.h>
 #include <linux/random.h>
+#include <trace/napi.h>
 
 #include "net-sysfs.h"
 
@@ -2771,8 +2772,10 @@ static void net_rx_action(struct softirq_action *h)
                  * accidently calling ->poll() when NAPI is not scheduled.
                  */
                 work = 0;
-                if (test_bit(NAPI_STATE_SCHED, &n->state))
+                if (test_bit(NAPI_STATE_SCHED, &n->state)) {
                         work = n->poll(n, weight);
+                        trace_napi_poll(n);
+                }
 
                 WARN_ON_ONCE(work > weight);
 
diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 2797b711a978..a6c2ac2828fb 100644
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -22,8 +22,10 @@
 #include <linux/timer.h>
 #include <linux/bitops.h>
 #include <net/genetlink.h>
+#include <net/netevent.h>
 
 #include <trace/skb.h>
+#include <trace/napi.h>
 
 #include <asm/unaligned.h>
 
@@ -38,7 +40,8 @@ static void send_dm_alert(struct work_struct *unused);
  * and the work handle that will send up
  * netlink alerts
  */
-struct sock *dm_sock;
+static int trace_state = TRACE_OFF;
+static spinlock_t trace_state_lock = SPIN_LOCK_UNLOCKED;
 
 struct per_cpu_dm_data {
         struct work_struct dm_alert_work;
@@ -47,6 +50,13 @@ struct per_cpu_dm_data {
         struct timer_list send_timer;
 };
 
+struct dm_hw_stat_delta {
+        struct net_device *dev;
+        struct list_head list;
+        struct rcu_head rcu;
+        unsigned long last_drop_val;
+};
+
 static struct genl_family net_drop_monitor_family = {
         .id             = GENL_ID_GENERATE,
         .hdrsize        = 0,
@@ -59,7 +69,8 @@ static DEFINE_PER_CPU(struct per_cpu_dm_data, dm_cpu_data);
 
 static int dm_hit_limit = 64;
 static int dm_delay = 1;
-
+static unsigned long dm_hw_check_delta = 2*HZ;
+static LIST_HEAD(hw_stats_list);
 
 static void reset_per_cpu_data(struct per_cpu_dm_data *data)
 {
@@ -115,7 +126,7 @@ static void sched_send_work(unsigned long unused)
         schedule_work(&data->dm_alert_work);
 }
 
-static void trace_kfree_skb_hit(struct sk_buff *skb, void *location)
+static void trace_drop_common(struct sk_buff *skb, void *location)
 {
         struct net_dm_alert_msg *msg;
         struct nlmsghdr *nlh;
@@ -159,24 +170,80 @@ out:
         return;
 }
 
+static void trace_kfree_skb_hit(struct sk_buff *skb, void *location)
+{
+        trace_drop_common(skb, location);
+}
+
+static void trace_napi_poll_hit(struct napi_struct *napi)
+{
+        struct dm_hw_stat_delta *new_stat;
+
+        /*
+         * Ratelimit our check time to dm_hw_check_delta jiffies
+         */
+        if (!time_after(jiffies, napi->dev->last_rx + dm_hw_check_delta))
+                return;
+
+        rcu_read_lock();
+        list_for_each_entry_rcu(new_stat, &hw_stats_list, list) {
+                if ((new_stat->dev == napi->dev)  &&
+                    (napi->dev->stats.rx_dropped != new_stat->last_drop_val)) {
+                        trace_drop_common(NULL, NULL);
+                        new_stat->last_drop_val = napi->dev->stats.rx_dropped;
+                        break;
+                }
+        }
+        rcu_read_unlock();
+}
+
+
+static void free_dm_hw_stat(struct rcu_head *head)
+{
+        struct dm_hw_stat_delta *n;
+        n = container_of(head, struct dm_hw_stat_delta, rcu);
+        kfree(n);
+}
+
 static int set_all_monitor_traces(int state)
 {
         int rc = 0;
+        struct dm_hw_stat_delta *new_stat = NULL;
+        struct dm_hw_stat_delta *temp;
+
+        spin_lock(&trace_state_lock);
 
         switch (state) {
         case TRACE_ON:
                 rc |= register_trace_kfree_skb(trace_kfree_skb_hit);
+                rc |= register_trace_napi_poll(trace_napi_poll_hit);
                 break;
         case TRACE_OFF:
                 rc |= unregister_trace_kfree_skb(trace_kfree_skb_hit);
+                rc |= unregister_trace_napi_poll(trace_napi_poll_hit);
 
                 tracepoint_synchronize_unregister();
+
+                /*
+                 * Clean the device list
+                 */
+                list_for_each_entry_safe(new_stat, temp, &hw_stats_list, list) {
+                        if (new_stat->dev == NULL) {
+                                list_del_rcu(&new_stat->list);
+                                call_rcu(&new_stat->rcu, free_dm_hw_stat);
+                        }
+                }
                 break;
         default:
                 rc = 1;
                 break;
         }
 
+        if (!rc)
+                trace_state = state;
+
+        spin_unlock(&trace_state_lock);
+
         if (rc)
                 return -EINPROGRESS;
         return rc;
@@ -204,6 +271,44 @@ static int net_dm_cmd_trace(struct sk_buff *skb,
         return -ENOTSUPP;
 }
 
+static int dropmon_net_event(struct notifier_block *ev_block,
+                        unsigned long event, void *ptr)
+{
+        struct net_device *dev = ptr;
+        struct dm_hw_stat_delta *new_stat = NULL;
+        struct dm_hw_stat_delta *tmp;
+
+        switch (event) {
+        case NETDEV_REGISTER:
+                new_stat = kzalloc(sizeof(struct dm_hw_stat_delta), GFP_KERNEL);
+
+                if (!new_stat)
+                        goto out;
+
+                new_stat->dev = dev;
+                INIT_RCU_HEAD(&new_stat->rcu);
+                spin_lock(&trace_state_lock);
+                list_add_rcu(&new_stat->list, &hw_stats_list);
+                spin_unlock(&trace_state_lock);
+                break;
+        case NETDEV_UNREGISTER:
+                spin_lock(&trace_state_lock);
+                list_for_each_entry_safe(new_stat, tmp, &hw_stats_list, list) {
+                        if (new_stat->dev == dev) {
+                                new_stat->dev = NULL;
+                                if (trace_state == TRACE_OFF) {
+                                        list_del_rcu(&new_stat->list);
+                                        call_rcu(&new_stat->rcu, free_dm_hw_stat);
+                                        break;
+                                }
+                        }
+                }
+                spin_unlock(&trace_state_lock);
+                break;
+        }
+out:
+        return NOTIFY_DONE;
+}
 
 static struct genl_ops dropmon_ops[] = {
         {
@@ -220,6 +325,10 @@ static struct genl_ops dropmon_ops[] = {
         },
 };
 
+static struct notifier_block dropmon_net_notifier = {
+        .notifier_call = dropmon_net_event
+};
+
 static int __init init_net_drop_monitor(void)
 {
         int cpu;
@@ -243,12 +352,18 @@ static int __init init_net_drop_monitor(void)
                 ret = genl_register_ops(&net_drop_monitor_family,
                                         &dropmon_ops[i]);
                 if (ret) {
-                        printk(KERN_CRIT "failed to register operation %d\n",
+                        printk(KERN_CRIT "Failed to register operation %d\n",
                                 dropmon_ops[i].cmd);
                         goto out_unreg;
                 }
         }
 
+        rc = register_netdevice_notifier(&dropmon_net_notifier);
+        if (rc < 0) {
+                printk(KERN_CRIT "Failed to register netdevice notifier\n");
+                goto out_unreg;
+        }
+
         rc = 0;
 
         for_each_present_cpu(cpu) {
@@ -259,6 +374,7 @@ static int __init init_net_drop_monitor(void)
                 data->send_timer.data = cpu;
                 data->send_timer.function = sched_send_work;
         }
+
         goto out;
 
 out_unreg:
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 17d9f497b797..bd309384f8b8 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule,
         if (rule->target)
                 NLA_PUT_U32(skb, FRA_GOTO, rule->target);
 
-        if (ops->fill(rule, skb, nlh, frh) < 0)
+        if (ops->fill(rule, skb, frh) < 0)
                 goto nla_put_failure;
 
         return nlmsg_end(skb, nlh);
diff --git a/net/core/net-traces.c b/net/core/net-traces.c
index c8fb45665e4f..b07b25bd2cde 100644
--- a/net/core/net-traces.c
+++ b/net/core/net-traces.c
@@ -20,6 +20,7 @@
 #include <linux/netlink.h>
 #include <linux/net_dropmon.h>
 #include <trace/skb.h>
+#include <trace/napi.h>
 
 #include <asm/unaligned.h>
 #include <asm/bitops.h>
@@ -27,3 +28,6 @@
 
 DEFINE_TRACE(kfree_skb);
 EXPORT_TRACEPOINT_SYMBOL_GPL(kfree_skb);
+
+DEFINE_TRACE(napi_poll);
+EXPORT_TRACEPOINT_SYMBOL_GPL(napi_poll);
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
index 6b3edc9e6f19..b7292a2719dc 100644
--- a/net/core/net_namespace.c
+++ b/net/core/net_namespace.c
@@ -196,9 +196,7 @@ struct net *copy_net_ns(unsigned long flags, struct net *old_net)
 static int __init net_ns_init(void)
 {
         struct net_generic *ng;
-        int err;
 
-        printk(KERN_INFO "net_namespace: %zd bytes\n", sizeof(struct net));
 #ifdef CONFIG_NET_NS
         net_cachep = kmem_cache_create("net_namespace", sizeof(struct net),
                                         SMP_CACHE_BYTES,
@@ -217,15 +215,14 @@ static int __init net_ns_init(void)
         rcu_assign_pointer(init_net.gen, ng);
 
         mutex_lock(&net_mutex);
-        err = setup_net(&init_net);
+        if (setup_net(&init_net))
+                panic("Could not setup the initial network namespace");
 
         rtnl_lock();
         list_add_tail(&init_net.list, &net_namespace_list);
         rtnl_unlock();
 
         mutex_unlock(&net_mutex);
-        if (err)
-                panic("Could not setup the initial network namespace");
 
         return 0;
 }
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 64f51eec6576..67b4f3e3d4a5 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -24,6 +24,7 @@
 #include <net/tcp.h>
 #include <net/udp.h>
 #include <asm/unaligned.h>
+#include <trace/napi.h>
 
 /*
  * We maintain a small pool of fully-sized skbs, to make sure the
@@ -137,6 +138,7 @@ static int poll_one_napi(struct netpoll_info *npinfo,
         set_bit(NAPI_STATE_NPSVC, &napi->state);
 
         work = napi->poll(napi, budget);
+        trace_napi_poll(napi);
 
         clear_bit(NAPI_STATE_NPSVC, &napi->state);
         atomic_dec(&trapped);
diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c
index a2690b12e03c..72495f25269f 100644
--- a/net/decnet/dn_rules.c
+++ b/net/decnet/dn_rules.c
@@ -192,7 +192,7 @@ unsigned dnet_addr_type(__le16 addr)
 }
 
 static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
-                            struct nlmsghdr *nlh, struct fib_rule_hdr *frh)
+                            struct fib_rule_hdr *frh)
 {
         struct dn_fib_rule *r = (struct dn_fib_rule *)rule;
 
diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c
index 38904be4102e..92d9d97ec5e3 100644
--- a/net/ipv4/fib_rules.c
+++ b/net/ipv4/fib_rules.c
@@ -209,7 +209,7 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
 }
 
 static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
-                          struct nlmsghdr *nlh, struct fib_rule_hdr *frh)
+                          struct fib_rule_hdr *frh)
 {
         struct fib4_rule *rule4 = (struct fib4_rule *) rule;
 
diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c
index e1a36dbb5a27..00a7a5e4ac97 100644
--- a/net/ipv6/fib6_rules.c
+++ b/net/ipv6/fib6_rules.c
@@ -211,7 +211,7 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh,
 }
 
 static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb,
-                          struct nlmsghdr *nlh, struct fib_rule_hdr *frh)
+                          struct fib_rule_hdr *frh)
 {
         struct fib6_rule *rule6 = (struct fib6_rule *) rule;
 
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index d9dd94b6bf66..ea37741062a9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -941,7 +941,8 @@ static int tcp_v6_gso_send_check(struct sk_buff *skb)
         return 0;
 }
 
-struct sk_buff **tcp6_gro_receive(struct sk_buff **head, struct sk_buff *skb)
+static struct sk_buff **tcp6_gro_receive(struct sk_buff **head,
+                                         struct sk_buff *skb)
 {
         struct ipv6hdr *iph = skb_gro_network_header(skb);
 
@@ -961,9 +962,8 @@ struct sk_buff **tcp6_gro_receive(struct sk_buff **head, struct sk_buff *skb)
 
         return tcp_gro_receive(head, skb);
 }
-EXPORT_SYMBOL(tcp6_gro_receive);
 
-int tcp6_gro_complete(struct sk_buff *skb)
+static int tcp6_gro_complete(struct sk_buff *skb)
 {
         struct ipv6hdr *iph = ipv6_hdr(skb);
         struct tcphdr *th = tcp_hdr(skb);
@@ -974,7 +974,6 @@ int tcp6_gro_complete(struct sk_buff *skb)
 
         return tcp_gro_complete(skb);
 }
-EXPORT_SYMBOL(tcp6_gro_complete);
 
 static void tcp_v6_send_response(struct sk_buff *skb, u32 seq, u32 ack, u32 win,
                                  u32 ts, struct tcp_md5sig_key *key, int rst)
diff --git a/net/irda/irnetlink.c b/net/irda/irnetlink.c
index 82c6118d82c6..8dd7ed7e7c1f 100644
--- a/net/irda/irnetlink.c
+++ b/net/irda/irnetlink.c
@@ -148,21 +148,8 @@ static struct genl_ops irda_nl_ops[] = {
 
 int irda_nl_register(void)
 {
-        int err, i;
-
-        err = genl_register_family(&irda_nl_family);
-        if (err)
-                return err;
-
-        for (i = 0; i < ARRAY_SIZE(irda_nl_ops); i++) {
-                err = genl_register_ops(&irda_nl_family, &irda_nl_ops[i]);
-                if (err)
-                        goto err_out;
-        }
-        return 0;
- err_out:
-        genl_unregister_family(&irda_nl_family);
-        return err;
+        return genl_register_family_with_ops(&irda_nl_family,
+                irda_nl_ops, ARRAY_SIZE(irda_nl_ops));
 }
 
 void irda_nl_unregister(void)
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c
index e01061f49cdc..7c1333c67ff3 100644
--- a/net/netfilter/ipvs/ip_vs_ctl.c
+++ b/net/netfilter/ipvs/ip_vs_ctl.c
@@ -3345,22 +3345,8 @@ static struct genl_ops ip_vs_genl_ops[] __read_mostly = {
 
 static int __init ip_vs_genl_register(void)
 {
-        int ret, i;
-
-        ret = genl_register_family(&ip_vs_genl_family);
-        if (ret)
-                return ret;
-
-        for (i = 0; i < ARRAY_SIZE(ip_vs_genl_ops); i++) {
-                ret = genl_register_ops(&ip_vs_genl_family, &ip_vs_genl_ops[i]);
-                if (ret)
-                        goto err_out;
-        }
-        return 0;
-
-err_out:
-        genl_unregister_family(&ip_vs_genl_family);
-        return ret;
+        return genl_register_family_with_ops(&ip_vs_genl_family,
+                ip_vs_genl_ops, ARRAY_SIZE(ip_vs_genl_ops));
 }
 
 static void ip_vs_genl_unregister(void)
diff --git a/net/netlabel/netlabel_cipso_v4.c b/net/netlabel/netlabel_cipso_v4.c
index bf1ab1a6790d..e639298bc9c8 100644
--- a/net/netlabel/netlabel_cipso_v4.c
+++ b/net/netlabel/netlabel_cipso_v4.c
@@ -785,18 +785,6 @@ static struct genl_ops netlbl_cipsov4_ops[] = {
  */
 int __init netlbl_cipsov4_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_cipsov4_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_cipsov4_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_cipsov4_gnl_family,
-                                &netlbl_cipsov4_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_cipsov4_gnl_family,
+                netlbl_cipsov4_ops, ARRAY_SIZE(netlbl_cipsov4_ops));
 }
diff --git a/net/netlabel/netlabel_mgmt.c b/net/netlabel/netlabel_mgmt.c
index 1821c5d50fb8..8203623e65ad 100644
--- a/net/netlabel/netlabel_mgmt.c
+++ b/net/netlabel/netlabel_mgmt.c
@@ -779,18 +779,6 @@ static struct genl_ops netlbl_mgmt_genl_ops[] = {
  */
 int __init netlbl_mgmt_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_mgmt_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_mgmt_genl_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_mgmt_gnl_family,
-                                &netlbl_mgmt_genl_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_mgmt_gnl_family,
+                netlbl_mgmt_genl_ops, ARRAY_SIZE(netlbl_mgmt_genl_ops));
 }
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c
index f3c5c68c6848..fb357f010189 100644
--- a/net/netlabel/netlabel_unlabeled.c
+++ b/net/netlabel/netlabel_unlabeled.c
@@ -1478,20 +1478,8 @@ static struct genl_ops netlbl_unlabel_genl_ops[] = {
  */
 int __init netlbl_unlabel_genl_init(void)
 {
-        int ret_val, i;
-
-        ret_val = genl_register_family(&netlbl_unlabel_gnl_family);
-        if (ret_val != 0)
-                return ret_val;
-
-        for (i = 0; i < ARRAY_SIZE(netlbl_unlabel_genl_ops); i++) {
-                ret_val = genl_register_ops(&netlbl_unlabel_gnl_family,
-                                &netlbl_unlabel_genl_ops[i]);
-                if (ret_val != 0)
-                        return ret_val;
-        }
-
-        return 0;
+        return genl_register_family_with_ops(&netlbl_unlabel_gnl_family,
+                netlbl_unlabel_genl_ops, ARRAY_SIZE(netlbl_unlabel_genl_ops));
 }
 
 /*
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 1d3dd30099df..eed4c6a8afc0 100644
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -384,6 +384,52 @@ errout:
 }
 
 /**
+ * genl_register_family_with_ops - register a generic netlink family
+ * @family: generic netlink family
+ * @ops: operations to be registered
+ * @n_ops: number of elements to register
+ *
+ * Registers the specified family and operations from the specified table.
+ * Only one family may be registered with the same family name or identifier.
+ *
+ * The family id may equal GENL_ID_GENERATE causing an unique id to
+ * be automatically generated and assigned.
+ *
+ * Either a doit or dumpit callback must be specified for every registered
+ * operation or the function will fail. Only one operation structure per
+ * command identifier may be registered.
+ *
+ * See include/net/genetlink.h for more documenation on the operations
+ * structure.
+ *
+ * This is equivalent to calling genl_register_family() followed by
+ * genl_register_ops() for every operation entry in the table taking
+ * care to unregister the family on error path.
+ *
+ * Return 0 on success or a negative error code.
+ */
+int genl_register_family_with_ops(struct genl_family *family,
+        struct genl_ops *ops, size_t n_ops)
+{
+        int err, i;
+
+        err = genl_register_family(family);
+        if (err)
+                return err;
+
+        for (i = 0; i < n_ops; ++i, ++ops) {
+                err = genl_register_ops(family, ops);
+                if (err)
+                        goto err_out;
+        }
+        return 0;
+err_out:
+        genl_unregister_family(family);
+        return err;
+}
+EXPORT_SYMBOL(genl_register_family_with_ops);
+
+/**
  * genl_unregister_family - unregister generic netlink family
  * @family: generic netlink family
  *
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 766e6b41f7ca..c7c5d524967e 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -1570,9 +1570,9 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
         switch (i->type) {
         case PACKET_MR_MULTICAST:
                 if (what > 0)
-                        dev_mc_add(dev, i->addr, i->alen, 0);
+                        return dev_mc_add(dev, i->addr, i->alen, 0);
                 else
-                        dev_mc_delete(dev, i->addr, i->alen, 0);
+                        return dev_mc_delete(dev, i->addr, i->alen, 0);
                 break;
         case PACKET_MR_PROMISC:
                 return dev_set_promiscuity(dev, what);
@@ -1580,6 +1580,12 @@ static int packet_dev_mc(struct net_device *dev, struct packet_mclist *i,
         case PACKET_MR_ALLMULTI:
                 return dev_set_allmulti(dev, what);
                 break;
+        case PACKET_MR_UNICAST:
+                if (what > 0)
+                        return dev_unicast_add(dev, i->addr, i->alen);
+                else
+                        return dev_unicast_delete(dev, i->addr, i->alen);
+                break;
         default:;
         }
         return 0;
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;
 }
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 632504060789..56d729c43b31 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3918,18 +3918,13 @@ nla_put_failure:
 
 int nl80211_init(void)
 {
-        int err, i;
+        int err;
 
-        err = genl_register_family(&nl80211_fam);
+        err = genl_register_family_with_ops(&nl80211_fam,
+                nl80211_ops, ARRAY_SIZE(nl80211_ops));
         if (err)
                 return err;
 
-        for (i = 0; i < ARRAY_SIZE(nl80211_ops); i++) {
-                err = genl_register_ops(&nl80211_fam, &nl80211_ops[i]);
-                if (err)
-                        goto err_out;
-        }
-
         err = genl_register_mc_group(&nl80211_fam, &nl80211_config_mcgrp);
         if (err)
                 goto err_out;