---

yaml --- r: 22315 b: refs/heads/master c: 3b781fa h: refs/heads/master i: 22313: d60fce8 22311: 76e2c75 v: v3
git-mirror · Mar 21, 2006 · c38645f · c38645f
1 parent 9b11bf1
commit c38645f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a95fcacdc33fa12836c306deb085ef3e68bca15a
+refs/heads/master: 3b781fa10bcdb148924d1847f68899583e0d66ef
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -237,12 +237,11 @@ static int find_portno(struct net_bridge *br)
 	struct net_bridge_port *p;
 	unsigned long *inuse;
 
-	inuse = kmalloc(BITS_TO_LONGS(BR_MAX_PORTS)*sizeof(unsigned long),
+	inuse = kcalloc(BITS_TO_LONGS(BR_MAX_PORTS), sizeof(unsigned long),
 			GFP_KERNEL);
 	if (!inuse)
 		return -ENOMEM;
 
-	memset(inuse, 0, BITS_TO_LONGS(BR_MAX_PORTS)*sizeof(unsigned long));
 	set_bit(0, inuse);	/* zero is reserved */
 	list_for_each_entry(p, &br->port_list, list) {
 		set_bit(p->port_no, inuse);