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

The dwmac-socfpga.c conflict was a case of a bug fix overlapping
changes in net-next to handle an error pointer differently.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 577c9b071ad9..154116aafd0d 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -1699,12 +1699,6 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sock *sk,
                 }
         }
 
-        skb = iptunnel_handle_offloads(skb, udp_sum, type);
-        if (IS_ERR(skb)) {
-                err = -EINVAL;
-                goto err;
-        }
-
         skb_scrub_packet(skb, xnet);
 
         min_headroom = LL_RESERVED_SPACE(dst->dev) + dst->header_len
@@ -1724,6 +1718,12 @@ static int vxlan6_xmit_skb(struct dst_entry *dst, struct sock *sk,
                 goto err;
         }
 
+        skb = iptunnel_handle_offloads(skb, udp_sum, type);
+        if (IS_ERR(skb)) {
+                err = -EINVAL;
+                goto err;
+        }
+
         vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
         vxh->vx_flags = htonl(VXLAN_HF_VNI);
         vxh->vx_vni = md->vni;
@@ -1784,10 +1784,6 @@ int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
                 }
         }
 
-        skb = iptunnel_handle_offloads(skb, udp_sum, type);
-        if (IS_ERR(skb))
-                return PTR_ERR(skb);
-
         min_headroom = LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len
                         + VXLAN_HLEN + sizeof(struct iphdr)
                         + (skb_vlan_tag_present(skb) ? VLAN_HLEN : 0);
@@ -1803,6 +1799,10 @@ int vxlan_xmit_skb(struct rtable *rt, struct sock *sk, struct sk_buff *skb,
         if (WARN_ON(!skb))
                 return -ENOMEM;
 
+        skb = iptunnel_handle_offloads(skb, udp_sum, type);
+        if (IS_ERR(skb))
+                return PTR_ERR(skb);
+
         vxh = (struct vxlanhdr *) __skb_push(skb, sizeof(*vxh));
         vxh->vx_flags = htonl(VXLAN_HF_VNI);
         vxh->vx_vni = md->vni;