From c4c753d456e59ebbef673394c65231c8b85fb292 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Tue, 17 Sep 2002 21:39:55 +0000 Subject: *** empty log message *** --- br-nf-bds/linux/net/ipv4/ip_output.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'br-nf-bds/linux/net/ipv4/ip_output.c') 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, * Fred N. van Kempen, @@ -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) -- cgit v1.2.3