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 tag 'mfd-for-linus-3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
[firefly-linux-kernel-4.4.55.git]
/
net
/
netfilter
/
nf_log_common.c
diff --git
a/net/netfilter/nf_log_common.c
b/net/netfilter/nf_log_common.c
index eeb8ef4ff1a3c0d674072253fa1e47cea6b38d9a..a2233e77cf3990d8bbd2bde72747d2005fe2c1d4 100644
(file)
--- a/
net/netfilter/nf_log_common.c
+++ b/
net/netfilter/nf_log_common.c
@@
-158,7
+158,7
@@
nf_log_dump_packet_common(struct nf_log_buf *m, u_int8_t pf,
'0' + loginfo->u.log.level, prefix,
in ? in->name : "",
out ? out->name : "");
-#if
def CONFIG_BRIDGE_NETFILTER
+#if
IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
if (skb->nf_bridge) {
const struct net_device *physindev;
const struct net_device *physoutdev;