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 git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net...
[firefly-linux-kernel-4.4.55.git]
/
include
/
net
/
neighbour.h
diff --git
a/include/net/neighbour.h
b/include/net/neighbour.h
index 47f425464f847fd827719ac5da99cf2749824a14..f60558d0254ca1a482ab4eb2924ecbaf8d6c169c 100644
(file)
--- a/
include/net/neighbour.h
+++ b/
include/net/neighbour.h
@@
-373,7
+373,7
@@
static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
return 0;
}
-#if
def CONFIG_BRIDGE_NETFILTER
+#if
IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
{
unsigned int seq, hh_alen;