diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 13:41:45 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 13:41:45 +0000 |
| commit | 2717b28a97353742f11784c59dd5076639ec83f1 (patch) | |
| tree | ab6ae5629d32409b0ffbd44b6d7431fec049fdb5 /br-nf-bds/linux2.5/net/core/skbuff.c | |
| parent | 9f27ecfab2381936107268bcd2b7d8cfdd557305 (diff) | |
*** empty log message ***
Diffstat (limited to 'br-nf-bds/linux2.5/net/core/skbuff.c')
| -rw-r--r-- | br-nf-bds/linux2.5/net/core/skbuff.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/br-nf-bds/linux2.5/net/core/skbuff.c b/br-nf-bds/linux2.5/net/core/skbuff.c index eecc16e..b8ffeb6 100644 --- a/br-nf-bds/linux2.5/net/core/skbuff.c +++ b/br-nf-bds/linux2.5/net/core/skbuff.c @@ -4,7 +4,7 @@ * Authors: Alan Cox <iiitac@pyr.swan.ac.uk> * Florian La Roche <rzsfl@rz.uni-sb.de> * - * Version: $Id: skbuff.c,v 1.1 2002/08/24 09:27:04 bdschuym Exp $ + * Version: $Id: skbuff.c,v 1.2 2002/08/24 13:43:15 bdschuym Exp $ * * Fixes: * Alan Cox : Fixed the worst of the load @@ -232,8 +232,10 @@ static inline void skb_headerinit(void *p, kmem_cache_t *cache, skb->sk = NULL; skb->stamp.tv_sec = 0; /* No idea about time */ skb->dev = NULL; +#ifdef CONFIG_BRIDGE_NF skb->physindev = NULL; skb->physoutdev = NULL; +#endif skb->dst = NULL; memset(skb->cb, 0, sizeof(skb->cb)); skb->pkt_type = PACKET_HOST; /* Default type */ @@ -363,10 +365,10 @@ struct sk_buff *skb_clone(struct sk_buff *skb, int gfp_mask) n->sk = NULL; C(stamp); C(dev); +#ifdef CONFIG_BRIDGE_NF C(physindev); C(physoutdev); - C(physindev); - C(physoutdev); +#endif C(h); C(nh); C(mac); @@ -422,8 +424,10 @@ static void copy_skb_header(struct sk_buff *new, const struct sk_buff *old) new->list = NULL; new->sk = NULL; new->dev = old->dev; +#ifdef CONFIG_BRIDGE_NF new->physindev = old->physindev; new->physoutdev = old->physoutdev; +#endif new->priority = old->priority; new->protocol = old->protocol; new->dst = dst_clone(old->dst); |