diff options
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index fdfb8fe8c38c..83010231db99 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -274,6 +274,9 @@ struct sk_buff { | |||
274 | #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) | 274 | #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE) |
275 | __u8 ipvs_property:1; | 275 | __u8 ipvs_property:1; |
276 | #endif | 276 | #endif |
277 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
278 | struct sk_buff *nfct_reasm; | ||
279 | #endif | ||
277 | #ifdef CONFIG_BRIDGE_NETFILTER | 280 | #ifdef CONFIG_BRIDGE_NETFILTER |
278 | struct nf_bridge_info *nf_bridge; | 281 | struct nf_bridge_info *nf_bridge; |
279 | #endif | 282 | #endif |
@@ -1313,10 +1316,26 @@ static inline void nf_conntrack_get(struct nf_conntrack *nfct) | |||
1313 | if (nfct) | 1316 | if (nfct) |
1314 | atomic_inc(&nfct->use); | 1317 | atomic_inc(&nfct->use); |
1315 | } | 1318 | } |
1319 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
1320 | static inline void nf_conntrack_get_reasm(struct sk_buff *skb) | ||
1321 | { | ||
1322 | if (skb) | ||
1323 | atomic_inc(&skb->users); | ||
1324 | } | ||
1325 | static inline void nf_conntrack_put_reasm(struct sk_buff *skb) | ||
1326 | { | ||
1327 | if (skb) | ||
1328 | kfree_skb(skb); | ||
1329 | } | ||
1330 | #endif | ||
1316 | static inline void nf_reset(struct sk_buff *skb) | 1331 | static inline void nf_reset(struct sk_buff *skb) |
1317 | { | 1332 | { |
1318 | nf_conntrack_put(skb->nfct); | 1333 | nf_conntrack_put(skb->nfct); |
1319 | skb->nfct = NULL; | 1334 | skb->nfct = NULL; |
1335 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | ||
1336 | nf_conntrack_put_reasm(skb->nfct_reasm); | ||
1337 | skb->nfct_reasm = NULL; | ||
1338 | #endif | ||
1320 | } | 1339 | } |
1321 | 1340 | ||
1322 | #ifdef CONFIG_BRIDGE_NETFILTER | 1341 | #ifdef CONFIG_BRIDGE_NETFILTER |