From: David S. Miller Date: Fri, 14 Nov 2014 22:12:55 +0000 (-0500) Subject: Merge branch 'vxlan_gso_check' X-Git-Tag: v3.18-rc6~9^2~24 X-Git-Url: http://git.cascardo.info/?p=cascardo%2Flinux.git;a=commitdiff_plain;h=b7f4c0ba630f66d6499faf8bc265de880bde3112 Merge branch 'vxlan_gso_check' Joe Stringer says: ==================== Implement ndo_gso_check() for vxlan nics Most NICs that report NETIF_F_GSO_UDP_TUNNEL support VXLAN, and not other UDP-based encapsulation protocols where the format and size of the header may differ. This patch series implements a generic ndo_gso_check() for detecting VXLAN, then reuses it for these NICs. Implementation shamelessly stolen from Tom Herbert (with minor fixups): http://thread.gmane.org/gmane.linux.network/332428/focus=333111 v2: Drop i40e/fm10k patches (code diverged; handling separately). Refactor common code into vxlan_gso_check() helper. Minor style fixes. ==================== Signed-off-by: David S. Miller --- b7f4c0ba630f66d6499faf8bc265de880bde3112