Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[platform/kernel/linux-rpi.git] / net / ipv4 / ip_output.c

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index 7eb252d..b631ec6 100644 (file)
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -599,6 +599,7 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
        hlen = iph->ihl * 4;
        mtu = mtu - hlen;       /* Size of data space */
        IPCB(skb)->flags |= IPSKB_FRAG_COMPLETE;
+       ll_rs = LL_RESERVED_SPACE(rt->dst.dev);
 
        /* When frag_list is given, use it. First, check its validity:
         * some transformers could create wrong frag_list or break existing
@@ -614,14 +615,15 @@ int ip_do_fragment(struct net *net, struct sock *sk, struct sk_buff *skb,
                if (first_len - hlen > mtu ||
                    ((first_len - hlen) & 7) ||
                    ip_is_fragment(iph) ||
-                   skb_cloned(skb))
+                   skb_cloned(skb) ||
+                   skb_headroom(skb) < ll_rs)
                        goto slow_path;
 
                skb_walk_frags(skb, frag) {
                        /* Correct geometry. */
                        if (frag->len > mtu ||
                            ((frag->len & 7) && frag->next) ||
-                           skb_headroom(frag) < hlen)
+                           skb_headroom(frag) < hlen + ll_rs)
                                goto slow_path_clean;
 
                        /* Partially cloned skb? */
@@ -711,8 +713,6 @@ slow_path:
        left = skb->len - hlen;         /* Space per frame */
        ptr = hlen;             /* Where to start from */
 
-       ll_rs = LL_RESERVED_SPACE(rt->dst.dev);
-
        /*
         *      Fragment the datagram.
         */
@@ -853,61 +853,6 @@ csum_page(struct page *page, int offset, int copy)
        return csum;
 }
 
-static inline int ip_ufo_append_data(struct sock *sk,
-                       struct sk_buff_head *queue,
-                       int getfrag(void *from, char *to, int offset, int len,
-                              int odd, struct sk_buff *skb),
-                       void *from, int length, int hh_len, int fragheaderlen,
-                       int transhdrlen, int maxfraglen, unsigned int flags)
-{
-       struct sk_buff *skb;
-       int err;
-
-       /* There is support for UDP fragmentation offload by network
-        * device, so create one single skb packet containing complete
-        * udp datagram
-        */
-       skb = skb_peek_tail(queue);
-       if (!skb) {
-               skb = sock_alloc_send_skb(sk,
-                       hh_len + fragheaderlen + transhdrlen + 20,
-                       (flags & MSG_DONTWAIT), &err);
-
-               if (!skb)
-                       return err;
-
-               /* reserve space for Hardware header */
-               skb_reserve(skb, hh_len);
-
-               /* create space for UDP/IP header */
-               skb_put(skb, fragheaderlen + transhdrlen);
-
-               /* initialize network header pointer */
-               skb_reset_network_header(skb);
-
-               /* initialize protocol header pointer */
-               skb->transport_header = skb->network_header + fragheaderlen;
-
-               skb->csum = 0;
-
-               if (flags & MSG_CONFIRM)
-                       skb_set_dst_pending_confirm(skb, 1);
-
-               __skb_queue_tail(queue, skb);
-       } else if (skb_is_gso(skb)) {
-               goto append;
-       }
-
-       skb->ip_summed = CHECKSUM_PARTIAL;
-       /* specify the length of each IP datagram fragment */
-       skb_shinfo(skb)->gso_size = maxfraglen - fragheaderlen;
-       skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
-
-append:
-       return skb_append_datato_frags(sk, skb, getfrag, from,
-                                      (length - transhdrlen));
-}
-
 static int __ip_append_data(struct sock *sk,
                            struct flowi4 *fl4,
                            struct sk_buff_head *queue,
@@ -965,18 +910,6 @@ static int __ip_append_data(struct sock *sk,
                csummode = CHECKSUM_PARTIAL;
 
        cork->length += length;
-       if ((((length + (skb ? skb->len : fragheaderlen)) > mtu) ||
-            (skb && skb_is_gso(skb))) &&
-           (sk->sk_protocol == IPPROTO_UDP) &&
-           (rt->dst.dev->features & NETIF_F_UFO) && !dst_xfrm(&rt->dst) &&
-           (sk->sk_type == SOCK_DGRAM) && !sk->sk_no_check_tx) {
-               err = ip_ufo_append_data(sk, queue, getfrag, from, length,
-                                        hh_len, fragheaderlen, transhdrlen,
-                                        maxfraglen, flags);
-               if (err)
-                       goto error;
-               return 0;
-       }
 
        /* So, what's going on in the loop below?
         *
@@ -1287,15 +1220,6 @@ ssize_t  ip_append_page(struct sock *sk, struct flowi4 *fl4, struct page *page,
        if (!skb)
                return -EINVAL;
 
-       if ((size + skb->len > mtu) &&
-           (sk->sk_protocol == IPPROTO_UDP) &&
-           (rt->dst.dev->features & NETIF_F_UFO)) {
-               if (skb->ip_summed != CHECKSUM_PARTIAL)
-                       return -EOPNOTSUPP;
-
-               skb_shinfo(skb)->gso_size = mtu - fragheaderlen;
-               skb_shinfo(skb)->gso_type = SKB_GSO_UDP;
-       }
        cork->length += size;
 
        while (size > 0) {