Browse Source

genetlink: Optimize genl_register_family()

genl_register_family() doesn't need to call genl_family_find_byid
when GENL_ID_GENERATE is passed during register.

Patch on net-next-2.6, compile and reboot testing only.

Signed-off-by: Krishna Kumar <krkumar2@in.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Krishna Kumar 15 years ago
parent
commit
93860b08e3
1 changed files with 3 additions and 5 deletions
  1. 3 5
      net/netlink/genetlink.c

+ 3 - 5
net/netlink/genetlink.c

@@ -374,11 +374,6 @@ int genl_register_family(struct genl_family *family)
 		goto errout_locked;
 		goto errout_locked;
 	}
 	}
 
 
-	if (genl_family_find_byid(family->id)) {
-		err = -EEXIST;
-		goto errout_locked;
-	}
-
 	if (family->id == GENL_ID_GENERATE) {
 	if (family->id == GENL_ID_GENERATE) {
 		u16 newid = genl_generate_id();
 		u16 newid = genl_generate_id();
 
 
@@ -388,6 +383,9 @@ int genl_register_family(struct genl_family *family)
 		}
 		}
 
 
 		family->id = newid;
 		family->id = newid;
+	} else if (genl_family_find_byid(family->id)) {
+		err = -EEXIST;
+		goto errout_locked;
 	}
 	}
 
 
 	if (family->maxattr) {
 	if (family->maxattr) {