From 7a7eda3e5e0350c9ea83373a2e1576f409ade8d0 Mon Sep 17 00:00:00 2001
From: Jamal Hadi Salim <hadi@cyberus.ca>
Date: Mon, 13 Feb 2006 15:51:24 -0800
Subject: [PATCH] --- yaml --- r: 20255 b: refs/heads/master c:
 e200bd8065e4db6297cd8db071a9188cf9aa6b56 h: refs/heads/master i:   20253:
 5e1568715ea63f585f1947e58ef0696565d33774   20251:
 b86e60102e028db74d9d8ff1c0e2ce1576e6a27d   20247:
 03215398e9ddca68b8302679f579160013b4d002   20239:
 9bc026fdd28ce79535c92b527b30c9319b3cf494   20223:
 69c304238afb1bac00819a7a473bbf52cf7c20c7 v: v3

---
 [refs]                        |  2 +-
 trunk/net/netlink/genetlink.c | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index b2c76a47d99b..3410df5960a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 178a3259f2508e786fb1bd6538365a167cee35c1
+refs/heads/master: e200bd8065e4db6297cd8db071a9188cf9aa6b56
diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index 4ae1538c54a9..43e72419c868 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/net/netlink/genetlink.c
@@ -238,7 +238,7 @@ int genl_register_family(struct genl_family *family)
 					sizeof(struct nlattr *), GFP_KERNEL);
 		if (family->attrbuf == NULL) {
 			err = -ENOMEM;
-			goto errout;
+			goto errout_locked;
 		}
 	} else
 		family->attrbuf = NULL;
@@ -288,7 +288,7 @@ int genl_unregister_family(struct genl_family *family)
 	return -ENOENT;
 }
 
-static inline int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
+static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh,
 			       int *errp)
 {
 	struct genl_ops *ops;
@@ -375,7 +375,7 @@ static void genl_rcv(struct sock *sk, int len)
 	do {
 		if (genl_trylock())
 			return;
-		netlink_run_queue(sk, &qlen, &genl_rcv_msg);
+		netlink_run_queue(sk, &qlen, genl_rcv_msg);
 		genl_unlock();
 	} while (qlen && genl_sock && genl_sock->sk_receive_queue.qlen);
 }
@@ -549,10 +549,8 @@ static int __init genl_init(void)
 	netlink_set_nonroot(NETLINK_GENERIC, NL_NONROOT_RECV);
 	genl_sock = netlink_kernel_create(NETLINK_GENERIC, GENL_MAX_ID,
 					  genl_rcv, THIS_MODULE);
-	if (genl_sock == NULL) {
+	if (genl_sock == NULL)
 		panic("GENL: Cannot initialize generic netlink\n");
-		return -ENOMEM;
-	}
 
 	return 0;
 
@@ -560,7 +558,6 @@ static int __init genl_init(void)
 	genl_unregister_family(&genl_ctrl);
 errout:
 	panic("GENL: Cannot register controller: %d\n", err);
-	return err;
 }
 
 subsys_initcall(genl_init);