diff options
-rw-r--r-- | include/linux/skbuff.h | 24 | ||||
-rw-r--r-- | net/ipv4/netfilter/ipt_REJECT.c | 4 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 838ce0fdcef7..1a2611030d36 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -1351,16 +1351,6 @@ static inline void nf_conntrack_put_reasm(struct sk_buff *skb) | |||
1351 | kfree_skb(skb); | 1351 | kfree_skb(skb); |
1352 | } | 1352 | } |
1353 | #endif | 1353 | #endif |
1354 | static inline void nf_reset(struct sk_buff *skb) | ||
1355 | { | ||
1356 | nf_conntrack_put(skb->nfct); | ||
1357 | skb->nfct = NULL; | ||
1358 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
1359 | nf_conntrack_put_reasm(skb->nfct_reasm); | ||
1360 | skb->nfct_reasm = NULL; | ||
1361 | #endif | ||
1362 | } | ||
1363 | |||
1364 | #ifdef CONFIG_BRIDGE_NETFILTER | 1354 | #ifdef CONFIG_BRIDGE_NETFILTER |
1365 | static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge) | 1355 | static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge) |
1366 | { | 1356 | { |
@@ -1373,6 +1363,20 @@ static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge) | |||
1373 | atomic_inc(&nf_bridge->use); | 1363 | atomic_inc(&nf_bridge->use); |
1374 | } | 1364 | } |
1375 | #endif /* CONFIG_BRIDGE_NETFILTER */ | 1365 | #endif /* CONFIG_BRIDGE_NETFILTER */ |
1366 | static inline void nf_reset(struct sk_buff *skb) | ||
1367 | { | ||
1368 | nf_conntrack_put(skb->nfct); | ||
1369 | skb->nfct = NULL; | ||
1370 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
1371 | nf_conntrack_put_reasm(skb->nfct_reasm); | ||
1372 | skb->nfct_reasm = NULL; | ||
1373 | #endif | ||
1374 | #ifdef CONFIG_BRIDGE_NETFILTER | ||
1375 | nf_bridge_put(skb->nf_bridge); | ||
1376 | skb->nf_bridge = NULL; | ||
1377 | #endif | ||
1378 | } | ||
1379 | |||
1376 | #else /* CONFIG_NETFILTER */ | 1380 | #else /* CONFIG_NETFILTER */ |
1377 | static inline void nf_reset(struct sk_buff *skb) {} | 1381 | static inline void nf_reset(struct sk_buff *skb) {} |
1378 | #endif /* CONFIG_NETFILTER */ | 1382 | #endif /* CONFIG_NETFILTER */ |
diff --git a/net/ipv4/netfilter/ipt_REJECT.c b/net/ipv4/netfilter/ipt_REJECT.c index 26ea6c19f5bd..9d3b3579f27c 100644 --- a/net/ipv4/netfilter/ipt_REJECT.c +++ b/net/ipv4/netfilter/ipt_REJECT.c | |||
@@ -154,10 +154,6 @@ static void send_reset(struct sk_buff *oldskb, int hook) | |||
154 | /* This packet will not be the same as the other: clear nf fields */ | 154 | /* This packet will not be the same as the other: clear nf fields */ |
155 | nf_reset(nskb); | 155 | nf_reset(nskb); |
156 | nskb->nfmark = 0; | 156 | nskb->nfmark = 0; |
157 | #ifdef CONFIG_BRIDGE_NETFILTER | ||
158 | nf_bridge_put(nskb->nf_bridge); | ||
159 | nskb->nf_bridge = NULL; | ||
160 | #endif | ||
161 | 157 | ||
162 | tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl); | 158 | tcph = (struct tcphdr *)((u_int32_t*)nskb->nh.iph + nskb->nh.iph->ihl); |
163 | 159 | ||