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, 3 insertions, 2 deletions

diff --git a/drivers/net/vxlan.c b/drivers/net/vxlan.c
index 2668e528dee4..2f29d20aa08f 100644
--- a/drivers/net/vxlan.c
+++ b/drivers/net/vxlan.c
@@ -613,8 +613,9 @@ out:
 
 static int vxlan_gro_complete(struct sock *sk, struct sk_buff *skb, int nhoff)
 {
-        udp_tunnel_gro_complete(skb, nhoff);
-
+        /* Sets 'skb->inner_mac_header' since we are always called with
+         * 'skb->encapsulation' set.
+         */
         return eth_gro_complete(skb, nhoff + sizeof(struct vxlanhdr));
 }