projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
neighbour.h
diff --git
a/include/net/neighbour.h
b/include/net/neighbour.h
index 815b2ce9f4a496768fff673321a79bd39c0545c9..4014b623880cf529e3bb5b184a5b31dee650a8b5 100644
(file)
--- a/
include/net/neighbour.h
+++ b/
include/net/neighbour.h
@@
-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;