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

In netdevice.h we removed the structure in net-next that is being
changes in 'net'.  In macsec.c and rtnetlink.c we have overlaps
between fixes in 'net' and the u64 attribute changes in 'net-next'.

The mlx5 conflicts have to do with vxlan support dependencies.

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

1 files changed, 4 insertions, 2 deletions

diff --git a/net/ipv4/fou.c b/net/ipv4/fou.c
index 7ac5ec87b004..eeec7d60e5fd 100644
--- a/net/ipv4/fou.c
+++ b/net/ipv4/fou.c
@@ -227,8 +227,6 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb,
         int err = -ENOSYS;
         const struct net_offload **offloads;
 
-        udp_tunnel_gro_complete(skb, nhoff);
-
         rcu_read_lock();
         offloads = NAPI_GRO_CB(skb)->is_ipv6 ? inet6_offloads : inet_offloads;
         ops = rcu_dereference(offloads[proto]);
@@ -237,6 +235,8 @@ static int fou_gro_complete(struct sock *sk, struct sk_buff *skb,
 
         err = ops->callbacks.gro_complete(skb, nhoff);
 
+        skb_set_inner_mac_header(skb, nhoff);
+
 out_unlock:
         rcu_read_unlock();
 
@@ -412,6 +412,8 @@ static int gue_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)
 
         err = ops->callbacks.gro_complete(skb, nhoff + guehlen);
 
+        skb_set_inner_mac_header(skb, nhoff + guehlen);
+
 out_unlock:
         rcu_read_unlock();
         return err;