---

yaml --- r: 183972 b: refs/heads/master c: 570930f h: refs/heads/master v: v3
git-mirror · Feb 5, 2010 · 7b5e3a7 · 7b5e3a7
1 parent 8c9a0c8
commit 7b5e3a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfd5f4a3d605e0f6054df0b59fe0907ff7e696d3
+refs/heads/master: 570930fe1ee497de6aafd895dbe80116cb10525f
diff --git a/trunk/net/bridge/br_if.c b/trunk/net/bridge/br_if.c
@@ -206,8 +206,6 @@ static struct net_device *new_bridge_dev(struct net *net, const char *name)
 
 	br_netfilter_rtable_init(br);
 
-	INIT_LIST_HEAD(&br->age_list);
-
 	br_stp_timer_init(br);
 
 	return dev;

diff --git a/trunk/net/bridge/br_private.h b/trunk/net/bridge/br_private.h
@@ -93,7 +93,6 @@ struct net_bridge
 	struct net_device		*dev;
 	spinlock_t			hash_lock;
 	struct hlist_head		hash[BR_HASH_SIZE];
-	struct list_head		age_list;
 	unsigned long			feature_mask;
 #ifdef CONFIG_BRIDGE_NETFILTER
 	struct rtable 			fake_rtable;