lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Browse Source
This commit is contained in:
David S. Miller
2011-02-04 14:28:58 -08:00
parent 2b7bcebf95 1e6d93e45b
commit bd4a6974cc
36 changed files with 352 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
net/bridge/br_fdb.c
View File

@ -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;
}