git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c8d7b98
)
netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
author
Pablo Neira Ayuso
<pablo@netfilter.org>
Wed, 1 Oct 2014 09:19:17 +0000
(11:19 +0200)
committer
Pablo Neira Ayuso
<pablo@netfilter.org>
Thu, 2 Oct 2014 16:30:54 +0000
(18:30 +0200)
In 34666d4 ("netfilter: bridge: move br_netfilter out of the core"),
the bridge netfilter code has been modularized.
Use IS_ENABLED instead of ifdef to cover the module case.
Fixes: 34666d4 ("netfilter: bridge: move br_netfilter out of the core")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
net/core/skbuff.c
patch
|
blob
|
history
net/ipv4/ip_output.c
patch
|
blob
|
history
net/ipv4/netfilter/ipt_REJECT.c
patch
|
blob
|
history
net/ipv4/netfilter/nf_defrag_ipv4.c
patch
|
blob
|
history
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
patch
|
blob
|
history
net/netfilter/ipset/ip_set_hash_netiface.c
patch
|
blob
|
history
net/netfilter/nf_log_common.c
patch
|
blob
|
history
net/netfilter/nf_queue.c
patch
|
blob
|
history
net/netfilter/nfnetlink_log.c
patch
|
blob
|
history
net/netfilter/nfnetlink_queue_core.c
patch
|
blob
|
history
diff --cc
net/core/skbuff.c
Simple merge
diff --cc
net/ipv4/ip_output.c
Simple merge
diff --cc
net/ipv4/netfilter/ipt_REJECT.c
Simple merge
diff --cc
net/ipv4/netfilter/nf_defrag_ipv4.c
Simple merge
diff --cc
net/ipv6/netfilter/nf_defrag_ipv6_hooks.c
Simple merge
diff --cc
net/netfilter/ipset/ip_set_hash_netiface.c
Simple merge
diff --cc
net/netfilter/nf_log_common.c
Simple merge
diff --cc
net/netfilter/nf_queue.c
Simple merge
diff --cc
net/netfilter/nfnetlink_log.c
Simple merge
diff --cc
net/netfilter/nfnetlink_queue_core.c
Simple merge