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 
Conflicts:
	drivers/net/bonding/bond_main.c
	net/core/net-sysfs.c
	net/ipv6/addrconf.c
This commit is contained in:
David S. Miller
2010-11-19 13:13:47 -08:00
parent 0670b8ae66 0302b8622c
commit 24912420e9
27 changed files with 155 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/neighbour.h
View File

@@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh)
static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
{
unsigned long now = ACCESS_ONCE(jiffies);
unsigned long now = jiffies;
if (neigh->used != now)
neigh->used = now;