diff options
| author | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-01 05:19:17 -0400 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2014-10-02 12:30:54 -0400 |
| commit | 1109a90c01177e8f4a5fd95c5b685ad02f1fe9bb (patch) | |
| tree | 2712547647a21ae3e56e2cb42dd2c84087ed640f /net/core | |
| parent | c8d7b98bec43faaa6583c3135030be5eb4693acb (diff) | |
netfilter: use IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
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>
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4be570a4ab21..7de3d679f3e0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -566,7 +566,7 @@ static void skb_release_head_state(struct sk_buff *skb) | |||
| 566 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) | 566 | #if IS_ENABLED(CONFIG_NF_CONNTRACK) |
| 567 | nf_conntrack_put(skb->nfct); | 567 | nf_conntrack_put(skb->nfct); |
| 568 | #endif | 568 | #endif |
| 569 | #ifdef CONFIG_BRIDGE_NETFILTER | 569 | #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER) |
| 570 | nf_bridge_put(skb->nf_bridge); | 570 | nf_bridge_put(skb->nf_bridge); |
| 571 | #endif | 571 | #endif |
| 572 | /* XXX: IS this still necessary? - JHS */ | 572 | /* XXX: IS this still necessary? - JHS */ |