diff options
author | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-17 21:39:55 +0000 |
---|---|---|
committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-17 21:39:55 +0000 |
commit | c4c753d456e59ebbef673394c65231c8b85fb292 (patch) | |
tree | 86768efcf644df7fecc1e0798fe1edbb057063a7 /br-nf-bds/linux/net/ipv4/ip_output.c | |
parent | 78c4a2cb95676732bf99f47933be0a1eaea29089 (diff) |
*** empty log message ***
Diffstat (limited to 'br-nf-bds/linux/net/ipv4/ip_output.c')
-rw-r--r-- | br-nf-bds/linux/net/ipv4/ip_output.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/br-nf-bds/linux/net/ipv4/ip_output.c b/br-nf-bds/linux/net/ipv4/ip_output.c index 0429d8f..ad1f552 100644 --- a/br-nf-bds/linux/net/ipv4/ip_output.c +++ b/br-nf-bds/linux/net/ipv4/ip_output.c @@ -5,7 +5,7 @@ * * The Internet Protocol (IP) output module. * - * Version: $Id: ip_output.c,v 1.3 2002/08/24 16:25:17 bdschuym Exp $ + * Version: $Id: ip_output.c,v 1.4 2002/09/17 21:51:08 bdschuym Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -830,10 +830,8 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*)) skb_set_owner_w(skb2, skb->sk); skb2->dst = dst_clone(skb->dst); skb2->dev = skb->dev; -#ifdef CONFIG_BRIDGE_NF skb2->physindev = skb->physindev; skb2->physoutdev = skb->physoutdev; -#endif /* * Copy the packet header into the new buffer. @@ -897,9 +895,9 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*)) iph->tot_len = htons(len + hlen); ip_send_check(iph); -#ifdef CONFIG_BRIDGE_NF + + // for bridge-netfilter memcpy(skb2->data - 16, skb->data - 16, 16); -#endif err = output(skb2); if (err) |