From 003284c51b472850ab1e17a3d7fc7d3d4d94f223 Mon Sep 17 00:00:00 2001
From: Changli Gao <xiaosuo@gmail.com>
Date: Mon, 26 Jul 2010 20:59:42 -0700
Subject: [PATCH] --- yaml --- r: 203759 b: refs/heads/master c:
 a256be70c57d6f8c827d09d645a1f6fe9330af72 h: refs/heads/master i:   203757:
 9b2be67115c7870da16dac1b00528aa3d72bbba5   203755:
 c037aa68d30f7e910dbec202d55d39e3096b4da9   203751:
 2fcc0201ca3cb253edcdc40dea08341bcfef6b1a   203743:
 11b84a537abd005224af30085ff6d48e12fe86f7 v: v3

---
 [refs]                        |  2 +-
 trunk/net/core/drop_monitor.c | 23 +++++++----------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index 696c56135b97..4c91c1f0d9c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 416c2f9cf5524cb53392cbcf99fef7aa687192ce
+refs/heads/master: a256be70c57d6f8c827d09d645a1f6fe9330af72
diff --git a/trunk/net/core/drop_monitor.c b/trunk/net/core/drop_monitor.c
index 646ef3bc7200..36e603c78ce9 100644
--- a/trunk/net/core/drop_monitor.c
+++ b/trunk/net/core/drop_monitor.c
@@ -347,9 +347,9 @@ static struct notifier_block dropmon_net_notifier = {
 
 static int __init init_net_drop_monitor(void)
 {
-	int cpu;
-	int rc, i, ret;
 	struct per_cpu_dm_data *data;
+	int cpu, rc;
+
 	printk(KERN_INFO "Initalizing network drop monitor service\n");
 
 	if (sizeof(void *) > 8) {
@@ -357,21 +357,12 @@ static int __init init_net_drop_monitor(void)
 		return -ENOSPC;
 	}
 
-	if (genl_register_family(&net_drop_monitor_family) < 0) {
+	rc = genl_register_family_with_ops(&net_drop_monitor_family,
+					   dropmon_ops,
+					   ARRAY_SIZE(dropmon_ops));
+	if (rc) {
 		printk(KERN_ERR "Could not create drop monitor netlink family\n");
-		return -EFAULT;
-	}
-
-	rc = -EFAULT;
-
-	for (i = 0; i < ARRAY_SIZE(dropmon_ops); i++) {
-		ret = genl_register_ops(&net_drop_monitor_family,
-					&dropmon_ops[i]);
-		if (ret) {
-			printk(KERN_CRIT "Failed to register operation %d\n",
-				dropmon_ops[i].cmd);
-			goto out_unreg;
-		}
+		return rc;
 	}
 
 	rc = register_netdevice_notifier(&dropmon_net_notifier);