diff options
| author | David S. Miller <davem@davemloft.net> | 2011-02-04 14:28:58 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-02-04 14:28:58 -0800 |
| commit | bd4a6974cc9090ef3851e5b0a2071e5383565c7c (patch) | |
| tree | e96ef46426d293b730a305b5185ba5412c9172d4 /net/bridge | |
| parent | 2b7bcebf958c74124220ee8103024def8597b36c (diff) | |
| parent | 1e6d93e45b231b3ae87c01902ede2315aacfe976 (diff) | |
| download | linux-3.10-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.gz linux-3.10-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.tar.bz2 linux-3.10-bd4a6974cc9090ef3851e5b0a2071e5383565c7c.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br_fdb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index 2872393b293..88485cc74dc 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -328,12 +328,12 @@ static struct net_bridge_fdb_entry *fdb_create(struct hlist_head *head, fdb = kmem_cache_alloc(br_fdb_cache, GFP_ATOMIC); if (fdb) { memcpy(fdb->addr.addr, addr, ETH_ALEN); - hlist_add_head_rcu(&fdb->hlist, head); - fdb->dst = source; fdb->is_local = is_local; fdb->is_static = is_local; fdb->ageing_timer = jiffies; + + hlist_add_head_rcu(&fdb->hlist, head); } return fdb; } |