diff options
author | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-11-19 16:13:47 -0500 |
commit | 24912420e923d56461b400d83f250a31bed8a964 (patch) | |
tree | 3bb599e665ed7510df2e3f4c8cb008f7a33f50a9 /include/net/neighbour.h | |
parent | 0670b8ae66daf1d326c7bd10e73daff5f18fcf92 (diff) | |
parent | 0302b8622ce696af1cda22fcf207d3793350e896 (diff) |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
net/core/net-sysfs.c
net/ipv6/addrconf.c
Diffstat (limited to 'include/net/neighbour.h')
-rw-r--r-- | include/net/neighbour.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/neighbour.h b/include/net/neighbour.h index 815b2ce9f4a..4014b623880 100644 --- a/include/net/neighbour.h +++ b/include/net/neighbour.h | |||
@@ -303,7 +303,7 @@ static inline void neigh_confirm(struct neighbour *neigh) | |||
303 | 303 | ||
304 | static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) | 304 | static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) |
305 | { | 305 | { |
306 | unsigned long now = ACCESS_ONCE(jiffies); | 306 | unsigned long now = jiffies; |
307 | 307 | ||
308 | if (neigh->used != now) | 308 | if (neigh->used != now) |
309 | neigh->used = now; | 309 | neigh->used = now; |