From 3bc1221de87539fee6129435dba9f46af9c023c2 Mon Sep 17 00:00:00 2001
From: Per Liden <per.liden@ericsson.com>
Date: Fri, 13 Jan 2006 13:06:40 -0800
Subject: [PATCH] --- yaml --- r: 18293 b: refs/heads/master c:
 23b0ca5bf52cef0ab0f0fe247cb91cbef836e7eb h: refs/heads/master i:   18291:
 f6fad8bacf1750615bc3ea2cac092571906b1679 v: v3

---
 [refs]                        | 2 +-
 trunk/include/net/genetlink.h | 1 -
 trunk/net/netlink/genetlink.c | 7 -------
 trunk/net/tipc/netlink.c      | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 8410e25044b8..eee52f66acc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e4e6a17af35be359cc8f1c924f8f198fbd478cc
+refs/heads/master: 23b0ca5bf52cef0ab0f0fe247cb91cbef836e7eb
diff --git a/trunk/include/net/genetlink.h b/trunk/include/net/genetlink.h
index c5b96b2b8155..805de50df00d 100644
--- a/trunk/include/net/genetlink.h
+++ b/trunk/include/net/genetlink.h
@@ -22,7 +22,6 @@ struct genl_family
 	char			name[GENL_NAMSIZ];
 	unsigned int		version;
 	unsigned int		maxattr;
-	struct module *		owner;
 	struct nlattr **	attrbuf;	/* private */
 	struct list_head	ops_list;	/* private */
 	struct list_head	family_list;	/* private */
diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index 3b1378498d50..4ae1538c54a9 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/net/netlink/genetlink.c
@@ -222,11 +222,6 @@ int genl_register_family(struct genl_family *family)
 		goto errout_locked;
 	}
 
-	if (!try_module_get(family->owner)) {
-		err = -EBUSY;
-		goto errout_locked;
-	}
-
 	if (family->id == GENL_ID_GENERATE) {
 		u16 newid = genl_generate_id();
 
@@ -283,7 +278,6 @@ int genl_unregister_family(struct genl_family *family)
 		INIT_LIST_HEAD(&family->ops_list);
 		genl_unlock();
 
-		module_put(family->owner);
 		kfree(family->attrbuf);
 		genl_ctrl_event(CTRL_CMD_DELFAMILY, family);
 		return 0;
@@ -535,7 +529,6 @@ static struct genl_family genl_ctrl = {
 	.name = "nlctrl",
 	.version = 0x1,
 	.maxattr = CTRL_ATTR_MAX,
-	.owner = THIS_MODULE,
 };
 
 static int __init genl_init(void)
diff --git a/trunk/net/tipc/netlink.c b/trunk/net/tipc/netlink.c
index 6fe95acde4fa..19b3f4022532 100644
--- a/trunk/net/tipc/netlink.c
+++ b/trunk/net/tipc/netlink.c
@@ -72,7 +72,6 @@ static struct genl_family family = {
         .version	= TIPC_GENL_VERSION,
         .hdrsize	= TIPC_GENL_HDRLEN,
         .maxattr	= 0,
-	.owner		= THIS_MODULE,
 };
 
 static struct genl_ops ops = {