1 files changed, 61 insertions, 62 deletions

diff --git a/net/ipv4/ip_output.c b/net/ipv4/ip_output.c
index d096332f6c6d..534650cad3a8 100644
--- a/net/ipv4/ip_output.c
+++ b/net/ipv4/ip_output.c
@@ -95,8 +95,8 @@ __inline__ void ip_send_check(struct iphdr *iph)
 /* dev_loopback_xmit for use with netfilter. */
 static int ip_dev_loopback_xmit(struct sk_buff *newskb)
 {
-        newskb->mac.raw = newskb->data;
-        __skb_pull(newskb, newskb->nh.raw - newskb->data);
+        skb_reset_mac_header(newskb);
+        __skb_pull(newskb, skb_network_offset(newskb));
         newskb->pkt_type = PACKET_LOOPBACK;
         newskb->ip_summed = CHECKSUM_UNNECESSARY;
         BUG_TRAP(newskb->dst);
@@ -125,11 +125,9 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
         struct iphdr *iph;
 
         /* Build the IP header. */
-        if (opt)
-                iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr) + opt->optlen);
-        else
-                iph=(struct iphdr *)skb_push(skb,sizeof(struct iphdr));
-
+        skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));
+        skb_reset_network_header(skb);
+        iph = ip_hdr(skb);
         iph->version  = 4;
         iph->ihl      = 5;
         iph->tos      = inet->tos;
@@ -143,7 +141,6 @@ int ip_build_and_send_pkt(struct sk_buff *skb, struct sock *sk,
         iph->protocol = sk->sk_protocol;
         iph->tot_len  = htons(skb->len);
         ip_select_ident(iph, &rt->u.dst, sk);
-        skb->nh.iph   = iph;
 
         if (opt && opt->optlen) {
                 iph->ihl += opt->optlen>>2;
@@ -192,6 +189,14 @@ static inline int ip_finish_output2(struct sk_buff *skb)
         return -EINVAL;
 }
 
+static inline int ip_skb_dst_mtu(struct sk_buff *skb)
+{
+        struct inet_sock *inet = skb->sk ? inet_sk(skb->sk) : NULL;
+
+        return (inet && inet->pmtudisc == IP_PMTUDISC_PROBE) ?
+               skb->dst->dev->mtu : dst_mtu(skb->dst);
+}
+
 static inline int ip_finish_output(struct sk_buff *skb)
 {
 #if defined(CONFIG_NETFILTER) && defined(CONFIG_XFRM)
@@ -201,7 +206,7 @@ static inline int ip_finish_output(struct sk_buff *skb)
                 return dst_output(skb);
         }
 #endif
-        if (skb->len > dst_mtu(skb->dst) && !skb_is_gso(skb))
+        if (skb->len > ip_skb_dst_mtu(skb) && !skb_is_gso(skb))
                 return ip_fragment(skb, ip_finish_output2);
         else
                 return ip_finish_output2(skb);
@@ -248,7 +253,7 @@ int ip_mc_output(struct sk_buff *skb)
 
                 /* Multicasts with ttl 0 must not go beyond the host */
 
-                if (skb->nh.iph->ttl == 0) {
+                if (ip_hdr(skb)->ttl == 0) {
                         kfree_skb(skb);
                         return 0;
                 }
@@ -333,7 +338,9 @@ packet_routed:
                 goto no_route;
 
         /* OK, we know where to send it, allocate and build IP header. */
-        iph = (struct iphdr *) skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));
+        skb_push(skb, sizeof(struct iphdr) + (opt ? opt->optlen : 0));
+        skb_reset_network_header(skb);
+        iph = ip_hdr(skb);
         *((__be16 *)iph) = htons((4 << 12) | (5 << 8) | (inet->tos & 0xff));
         iph->tot_len = htons(skb->len);
         if (ip_dont_fragment(sk, &rt->u.dst) && !ipfragok)
@@ -344,7 +351,6 @@ packet_routed:
         iph->protocol = sk->sk_protocol;
         iph->saddr    = rt->rt_src;
         iph->daddr    = rt->rt_dst;
-        skb->nh.iph   = iph;
         /* Transport layer set skb->h.foo itself. */
 
         if (opt && opt->optlen) {
@@ -386,21 +392,10 @@ static void ip_copy_metadata(struct sk_buff *to, struct sk_buff *from)
 #ifdef CONFIG_NET_SCHED
         to->tc_index = from->tc_index;
 #endif
-#ifdef CONFIG_NETFILTER
-        /* Connection association is same as pre-frag packet */
-        nf_conntrack_put(to->nfct);
-        to->nfct = from->nfct;
-        nf_conntrack_get(to->nfct);
-        to->nfctinfo = from->nfctinfo;
+        nf_copy(to, from);
 #if defined(CONFIG_IP_VS) || defined(CONFIG_IP_VS_MODULE)
         to->ipvs_property = from->ipvs_property;
 #endif
-#ifdef CONFIG_BRIDGE_NETFILTER
-        nf_bridge_put(to->nf_bridge);
-        to->nf_bridge = from->nf_bridge;
-        nf_bridge_get(to->nf_bridge);
-#endif
-#endif
         skb_copy_secmark(to, from);
 }
 
@@ -430,12 +425,12 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
          *      Point into the IP datagram header.
          */
 
-        iph = skb->nh.iph;
+        iph = ip_hdr(skb);
 
         if (unlikely((iph->frag_off & htons(IP_DF)) && !skb->local_df)) {
                 IP_INC_STATS(IPSTATS_MIB_FRAGFAILS);
                 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_FRAG_NEEDED,
-                          htonl(dst_mtu(&rt->u.dst)));
+                          htonl(ip_skb_dst_mtu(skb)));
                 kfree_skb(skb);
                 return -EMSGSIZE;
         }
@@ -502,10 +497,11 @@ int ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff*))
                          * before previous one went down. */
                         if (frag) {
                                 frag->ip_summed = CHECKSUM_NONE;
-                                frag->h.raw = frag->data;
-                                frag->nh.raw = __skb_push(frag, hlen);
-                                memcpy(frag->nh.raw, iph, hlen);
-                                iph = frag->nh.iph;
+                                skb_reset_transport_header(frag);
+                                __skb_push(frag, hlen);
+                                skb_reset_network_header(frag);
+                                memcpy(skb_network_header(frag), iph, hlen);
+                                iph = ip_hdr(frag);
                                 iph->tot_len = htons(frag->len);
                                 ip_copy_metadata(frag, skb);
                                 if (offset == 0)
@@ -566,7 +562,7 @@ slow_path:
          *      Keep copying data until we run out.
          */
 
-        while(left > 0) {
+        while (left > 0) {
                 len = left;
                 /* IF: it doesn't fit, use 'mtu' - the data space left */
                 if (len > mtu)
@@ -593,8 +589,8 @@ slow_path:
                 ip_copy_metadata(skb2, skb);
                 skb_reserve(skb2, ll_rs);
                 skb_put(skb2, len + hlen);
-                skb2->nh.raw = skb2->data;
-                skb2->h.raw = skb2->data + hlen;
+                skb_reset_network_header(skb2);
+                skb2->transport_header = skb2->network_header + hlen;
 
                 /*
                  *      Charge the memory for the fragment to any owner
@@ -608,19 +604,19 @@ slow_path:
                  *      Copy the packet header into the new buffer.
                  */
 
-                memcpy(skb2->nh.raw, skb->data, hlen);
+                skb_copy_from_linear_data(skb, skb_network_header(skb2), hlen);
 
                 /*
                  *      Copy a block of the IP datagram.
                  */
-                if (skb_copy_bits(skb, ptr, skb2->h.raw, len))
+                if (skb_copy_bits(skb, ptr, skb_transport_header(skb2), len))
                         BUG();
                 left -= len;
 
                 /*
                  *      Fill in the new header fields.
                  */
-                iph = skb2->nh.iph;
+                iph = ip_hdr(skb2);
                 iph->frag_off = htons((offset >> 3));
 
                 /* ANK: dirty, but effective trick. Upgrade options only if
@@ -722,10 +718,10 @@ static inline int ip_ufo_append_data(struct sock *sk,
                 skb_put(skb,fragheaderlen + transhdrlen);
 
                 /* initialize network header pointer */
-                skb->nh.raw = skb->data;
+                skb_reset_network_header(skb);
 
                 /* initialize protocol header pointer */
-                skb->h.raw = skb->data + fragheaderlen;
+                skb->transport_header = skb->network_header + fragheaderlen;
 
                 skb->ip_summed = CHECKSUM_PARTIAL;
                 skb->csum = 0;
@@ -799,7 +795,9 @@ int ip_append_data(struct sock *sk,
                         inet->cork.addr = ipc->addr;
                 }
                 dst_hold(&rt->u.dst);
-                inet->cork.fragsize = mtu = dst_mtu(rt->u.dst.path);
+                inet->cork.fragsize = mtu = inet->pmtudisc == IP_PMTUDISC_PROBE ?
+                                            rt->u.dst.dev->mtu :
+                                            dst_mtu(rt->u.dst.path);
                 inet->cork.rt = rt;
                 inet->cork.length = 0;
                 sk->sk_sndmsg_page = NULL;
@@ -929,9 +927,10 @@ alloc_new_skb:
                          *      Find where to start putting bytes.
                          */
                         data = skb_put(skb, fraglen);
-                        skb->nh.raw = data + exthdrlen;
+                        skb_set_network_header(skb, exthdrlen);
+                        skb->transport_header = (skb->network_header +
+                                                 fragheaderlen);
                         data += fragheaderlen;
-                        skb->h.raw = data + exthdrlen;
 
                         if (fraggap) {
                                 skb->csum = skb_copy_and_csum_bits(
@@ -1100,8 +1099,6 @@ ssize_t	ip_append_page(struct sock *sk, struct page *page,
                 }
                 if (len <= 0) {
                         struct sk_buff *skb_prev;
-                        char *data;
-                        struct iphdr *iph;
                         int alloclen;
 
                         skb_prev = skb;
@@ -1124,15 +1121,15 @@ ssize_t	ip_append_page(struct sock *sk, struct page *page,
                         /*
                          *      Find where to start putting bytes.
                          */
-                        data = skb_put(skb, fragheaderlen + fraggap);
-                        skb->nh.iph = iph = (struct iphdr *)data;
-                        data += fragheaderlen;
-                        skb->h.raw = data;
-
+                        skb_put(skb, fragheaderlen + fraggap);
+                        skb_reset_network_header(skb);
+                        skb->transport_header = (skb->network_header +
+                                                 fragheaderlen);
                         if (fraggap) {
-                                skb->csum = skb_copy_and_csum_bits(
-                                        skb_prev, maxfraglen,
-                                        data, fraggap, 0);
+                                skb->csum = skb_copy_and_csum_bits(skb_prev,
+                                                                   maxfraglen,
+                                                    skb_transport_header(skb),
+                                                                   fraggap, 0);
                                 skb_prev->csum = csum_sub(skb_prev->csum,
                                                           skb->csum);
                                 pskb_trim_unique(skb_prev, maxfraglen);
@@ -1198,10 +1195,10 @@ int ip_push_pending_frames(struct sock *sk)
         tail_skb = &(skb_shinfo(skb)->frag_list);
 
         /* move skb->data to ip header from ext header */
-        if (skb->data < skb->nh.raw)
-                __skb_pull(skb, skb->nh.raw - skb->data);
+        if (skb->data < skb_network_header(skb))
+                __skb_pull(skb, skb_network_offset(skb));
         while ((tmp_skb = __skb_dequeue(&sk->sk_write_queue)) != NULL) {
-                __skb_pull(tmp_skb, skb->h.raw - skb->nh.raw);
+                __skb_pull(tmp_skb, skb_network_header_len(skb));
                 *tail_skb = tmp_skb;
                 tail_skb = &(tmp_skb->next);
                 skb->len += tmp_skb->len;
@@ -1216,13 +1213,13 @@ int ip_push_pending_frames(struct sock *sk)
          * to fragment the frame generated here. No matter, what transforms
          * how transforms change size of the packet, it will come out.
          */
-        if (inet->pmtudisc != IP_PMTUDISC_DO)
+        if (inet->pmtudisc < IP_PMTUDISC_DO)
                 skb->local_df = 1;
 
         /* DF bit is set when we want to see DF on outgoing frames.
          * If local_df is set too, we still allow to fragment this frame
          * locally. */
-        if (inet->pmtudisc == IP_PMTUDISC_DO ||
+        if (inet->pmtudisc >= IP_PMTUDISC_DO ||
             (skb->len <= dst_mtu(&rt->u.dst) &&
              ip_dont_fragment(sk, &rt->u.dst)))
                 df = htons(IP_DF);
@@ -1352,11 +1349,11 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
                 struct flowi fl = { .nl_u = { .ip4_u =
                                               { .daddr = daddr,
                                                 .saddr = rt->rt_spec_dst,
-                                                .tos = RT_TOS(skb->nh.iph->tos) } },
+                                                .tos = RT_TOS(ip_hdr(skb)->tos) } },
                                     /* Not quite clean, but right. */
                                     .uli_u = { .ports =
-                                               { .sport = skb->h.th->dest,
-                                                 .dport = skb->h.th->source } },
+                                               { .sport = tcp_hdr(skb)->dest,
+                                                 .dport = tcp_hdr(skb)->source } },
                                     .proto = sk->sk_protocol };
                 security_skb_classify_flow(skb, &fl);
                 if (ip_route_output_key(&rt, &fl))
@@ -1370,14 +1367,16 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar
            with locally disabled BH and that sk cannot be already spinlocked.
          */
         bh_lock_sock(sk);
-        inet->tos = skb->nh.iph->tos;
+        inet->tos = ip_hdr(skb)->tos;
         sk->sk_priority = skb->priority;
-        sk->sk_protocol = skb->nh.iph->protocol;
+        sk->sk_protocol = ip_hdr(skb)->protocol;
         ip_append_data(sk, ip_reply_glue_bits, arg->iov->iov_base, len, 0,
                        &ipc, rt, MSG_DONTWAIT);
         if ((skb = skb_peek(&sk->sk_write_queue)) != NULL) {
                 if (arg->csumoffset >= 0)
-                        *((__sum16 *)skb->h.raw + arg->csumoffset) = csum_fold(csum_add(skb->csum, arg->csum));
+                        *((__sum16 *)skb_transport_header(skb) +
+                          arg->csumoffset) = csum_fold(csum_add(skb->csum,
+                                                                arg->csum));
                 skb->ip_summed = CHECKSUM_NONE;
                 ip_push_pending_frames(sk);
         }