diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 16:23:01 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-08-24 16:23:01 +0000 |
| commit | c96e724b48fabf7f8e7dcf0f763cde12563fb678 (patch) | |
| tree | da29fd4cb8fa175c35eeba1659f0fe617a505f82 /br-nf-bds/linux/net/ipv4/ip_output.c | |
| parent | 2717b28a97353742f11784c59dd5076639ec83f1 (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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/br-nf-bds/linux/net/ipv4/ip_output.c b/br-nf-bds/linux/net/ipv4/ip_output.c index 2da82b4..0429d8f 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.2 2002/08/24 08:46:04 bdschuym Exp $ + * Version: $Id: ip_output.c,v 1.3 2002/08/24 16:25:17 bdschuym Exp $ * * Authors: Ross Biro, <bir7@leland.Stanford.Edu> * Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG> @@ -830,8 +830,10 @@ 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. @@ -895,7 +897,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 memcpy(skb2->data - 16, skb->data - 16, 16); +#endif err = output(skb2); if (err) |