diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-10-19 11:05:49 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-10-19 11:05:49 +0000 |
| commit | e68bed817a8999e48cc6062e11f0de95b4547a1c (patch) | |
| tree | a279f34e89028a9590c3fecd7b255510982c52b4 /br-nf-bds/linux2.5 | |
| parent | 88cb9879143718a987902b40e966b3dddd3c2b32 (diff) | |
introduce nf_bridge
Diffstat (limited to 'br-nf-bds/linux2.5')
| -rw-r--r-- | br-nf-bds/linux2.5/include/linux/skbuff.h | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/br-nf-bds/linux2.5/include/linux/skbuff.h b/br-nf-bds/linux2.5/include/linux/skbuff.h index c08e648..0a43a95 100644 --- a/br-nf-bds/linux2.5/include/linux/skbuff.h +++ b/br-nf-bds/linux2.5/include/linux/skbuff.h @@ -96,6 +96,14 @@ struct nf_conntrack { struct nf_ct_info { struct nf_conntrack *master; }; + +struct nf_bridge_info { + atomic_t use; + struct net_device *physindev; + struct net_device *physoutdev; + unsigned int mask; + unsigned long hh[16 / sizeof(unsigned long)]; +}; #endif struct sk_buff_head { @@ -140,8 +148,6 @@ struct skb_shared_info { * @sk: Socket we are owned by * @stamp: Time we arrived * @dev: Device we arrived on/are leaving by - * @physindev: Phsical device we arrived on (see bridge-nf) - * @physoutdev: Phsical device we will leave by (see bridge-nf) * @h: Transport layer header * @nh: Network layer header * @mac: Link layer header @@ -168,6 +174,7 @@ struct skb_shared_info { * @nfcache: Cache info * @nfct: Associated connection, if any * @nf_debug: Netfilter debugging + * @nf_bridge: Saved data about a bridged frame - see br_netfilter.c * @tc_index: Traffic control index */ @@ -180,8 +187,6 @@ struct sk_buff { struct sock *sk; struct timeval stamp; struct net_device *dev; - struct net_device *physindev; - struct net_device *physoutdev; union { struct tcphdr *th; @@ -240,6 +245,7 @@ struct sk_buff { #ifdef CONFIG_NETFILTER_DEBUG unsigned int nf_debug; #endif + struct nf_bridge_info *nf_bridge; #endif /* CONFIG_NETFILTER */ #if defined(CONFIG_HIPPI) union { @@ -1141,6 +1147,17 @@ static inline void nf_conntrack_get(struct nf_ct_info *nfct) if (nfct) atomic_inc(&nfct->master->use); } + +static inline void nf_bridge_put(struct nf_bridge_info *nf_bridge) +{ + if (nf_bridge && atomic_dec_and_test(&nf_bridge->use)) + kfree(nf_bridge); +} +static inline void nf_bridge_get(struct nf_bridge_info *nf_bridge) +{ + if (nf_bridge) + atomic_inc(&nf_bridge->use); +} #endif #endif /* __KERNEL__ */ |