From 2717b28a97353742f11784c59dd5076639ec83f1 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Sat, 24 Aug 2002 13:41:45 +0000 Subject: *** empty log message *** --- br-nf-bds/linux2.5/net/ipv4/ip_output.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'br-nf-bds/linux2.5/net/ipv4/ip_output.c') diff --git a/br-nf-bds/linux2.5/net/ipv4/ip_output.c b/br-nf-bds/linux2.5/net/ipv4/ip_output.c index 130d631..c457da7 100644 --- a/br-nf-bds/linux2.5/net/ipv4/ip_output.c +++ b/br-nf-bds/linux2.5/net/ipv4/ip_output.c @@ -5,7 +5,7 @@ * * The Internet Protocol (IP) output module. * - * Version: $Id: ip_output.c,v 1.1 2002/08/24 09:25:29 bdschuym Exp $ + * Version: $Id: ip_output.c,v 1.2 2002/08/24 13:43:43 bdschuym Exp $ * * Authors: Ross Biro, * Fred N. van Kempen, @@ -835,8 +835,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. @@ -900,7 +902,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) -- cgit v1.2.3