From 7b5e3a7f1fe9af3db5516bba89ea70a691a18577 Mon Sep 17 00:00:00 2001 From: Herbert Xu Date: Thu, 4 Feb 2010 20:28:48 -0800 Subject: [PATCH] --- yaml --- r: 183972 b: refs/heads/master c: 570930fe1ee497de6aafd895dbe80116cb10525f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/bridge/br_if.c | 2 -- trunk/net/bridge/br_private.h | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 0afb9c7ac553..242fc7b584cd 100644 --- 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 index 7bc0604069c7..bc2b1badab88 100644 --- 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 index 2114e45682ea..1f0c4f44b765 100644 --- 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;