diff options
author | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-18 18:18:25 +0000 |
---|---|---|
committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-18 18:18:25 +0000 |
commit | 41426497d4a7630cf6044d5e90174b7243bd8215 (patch) | |
tree | c84df14ebb69a357b7e6968586014949715c4238 /br-nf-bds/linux2.5/net/core/skbuff.c | |
parent | ada6f3f546bcb93735002a5fdd234b146dab3e50 (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 | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/br-nf-bds/linux2.5/net/core/skbuff.c b/br-nf-bds/linux2.5/net/core/skbuff.c index b8ffeb6..f65e3f8 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.2 2002/08/24 13:43:15 bdschuym Exp $ + * Version: $Id: skbuff.c,v 1.3 2002/09/18 18:30:53 bdschuym Exp $ * * Fixes: * Alan Cox : Fixed the worst of the load @@ -232,10 +232,8 @@ 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 */ @@ -365,10 +363,8 @@ 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); -#endif C(h); C(nh); C(mac); @@ -424,10 +420,8 @@ 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); |