vserver 2.0 rc7

[linux-2.6.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 47054f8..760dc82 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -7,7 +7,7 @@
  *
  * Version:    $Id: ip_output.c,v 1.100 2002/02/01 22:01:03 davem Exp $
  *
- * Authors:    Ross Biro, <bir7@leland.Stanford.Edu>
+ * Authors:    Ross Biro
  *             Fred N. van Kempen, <waltje@uWalt.NL.Mugnet.ORG>
  *             Donald Becker, <becker@super.org>
  *             Alan Cox, <Alan.Cox@linux.org>
@@ -111,6 +111,7 @@ static int ip_dev_loopback_xmit(struct sk_buff *newskb)
 #ifdef CONFIG_NETFILTER_DEBUG
        nf_debug_ip_loopback_xmit(newskb);
 #endif
+       nf_reset(newskb);
        netif_rx(newskb);
        return 0;
 }
@@ -195,6 +196,8 @@ static inline int ip_finish_output2(struct sk_buff *skb)
        nf_debug_ip_finish_output2(skb);
 #endif /*CONFIG_NETFILTER_DEBUG*/
 
+       nf_reset(skb);
+
        if (hh) {
                int hh_alen;
 
@@ -278,7 +281,7 @@ int ip_mc_output(struct sk_buff *skb)
                                newskb->dev, ip_dev_loopback_xmit);
        }
 
-       if (skb->len > dst_pmtu(&rt->u.dst))
+       if (skb->len > dst_mtu(&rt->u.dst))
                return ip_fragment(skb, ip_finish_output);
        else
                return ip_finish_output(skb);
@@ -288,7 +291,7 @@ int ip_output(struct sk_buff *skb)
 {
        IP_INC_STATS(IPSTATS_MIB_OUTREQUESTS);
 
-       if (skb->len > dst_pmtu(skb->dst) && !skb_shinfo(skb)->tso_size)
+       if (skb->len > dst_mtu(skb->dst) && !skb_shinfo(skb)->tso_size)
                return ip_fragment(skb, ip_finish_output);
        else
                return ip_finish_output(skb);
@@ -448,7 +451,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
 
        if (unlikely((iph->frag_off & htons(IP_DF)) && !skb->local_df)) {
                icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-                         htonl(dst_pmtu(&rt->u.dst)));
+                         htonl(dst_mtu(&rt->u.dst)));
                kfree_skb(skb);
                return -EMSGSIZE;
        }
@@ -458,7 +461,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
         */
 
        hlen = iph->ihl * 4;
-       mtu = dst_pmtu(&rt->u.dst) - hlen;      /* Size of data space */
+       mtu = dst_mtu(&rt->u.dst) - hlen;       /* Size of data space */
 
        /* When frag_list is given, use it. First, check its validity:
         * some transformers could create wrong frag_list or break existing
@@ -487,6 +490,14 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
                        /* Partially cloned skb? */
                        if (skb_shared(frag))
                                goto slow_path;
+
+                       BUG_ON(frag->sk);
+                       if (skb->sk) {
+                               sock_hold(skb->sk);
+                               frag->sk = skb->sk;
+                               frag->destructor = sock_wfree;
+                               skb->truesize -= frag->truesize;
+                       }
                }
 
                /* Everything is OK. Generate! */
@@ -498,7 +509,7 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
                skb->data_len = first_len - skb_headlen(skb);
                skb->len = first_len;
                iph->tot_len = htons(first_len);
-               iph->frag_off |= htons(IP_MF);
+               iph->frag_off = htons(IP_MF);
                ip_send_check(iph);
 
                for (;;) {
@@ -746,7 +757,7 @@ int ip_append_data(struct sock *sk,
                        inet->cork.addr = ipc->addr;
                }
                dst_hold(&rt->u.dst);
-               inet->cork.fragsize = mtu = dst_pmtu(&rt->u.dst);
+               inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path);
                inet->cork.rt = rt;
                inet->cork.length = 0;
                sk->sk_sndmsg_page = NULL;
@@ -1152,7 +1163,8 @@ int ip_push_pending_frames(struct sock *sk)
         * If local_df is set too, we still allow to fragment this frame
         * locally. */
        if (inet->pmtudisc == IP_PMTUDISC_DO ||
-           (!skb_shinfo(skb)->frag_list && ip_dont_fragment(sk, &rt->u.dst)))
+           (skb->len <= dst_mtu(&rt->u.dst) &&
+            ip_dont_fragment(sk, &rt->u.dst)))
                df = htons(IP_DF);
 
        if (inet->cork.flags & IPCORK_OPT)