svn commit: r317081 - stable/11/sys/net

[Andrey V. Elsukov]

Author: ae
Date: Tue Apr 18 09:17:20 2017
New Revision: 317081
URL: https://svnweb.freebsd.org/changeset/base/317081

Log:
  MFC r316716:
    Inherit IPv6 checksum offloading flags to vlan interfaces.
  
    if_vlan(4) interfaces inherit IPv4 checksum offloading flags from the
    parent when VLAN_HWCSUM and VLAN_HWTAGGING flags are present on the
    parent interface. Do the same for IPv6 checksum offloading flags.
  
    Reported by:	Harry Schmalzbauer
    Reviewed by:	np, gnn
    Differential Revision:	https://reviews.freebsd.org/D10356

Modified:
  stable/11/sys/net/if_vlan.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/net/if_vlan.c
==============================================================================
--- stable/11/sys/net/if_vlan.c	Tue Apr 18 08:04:15 2017	(r317080)
+++ stable/11/sys/net/if_vlan.c	Tue Apr 18 09:17:20 2017	(r317081)
@@ -1547,13 +1547,16 @@ vlan_capabilities(struct ifvlan *ifv)
 	 * offloading requires hardware VLAN tagging.
 	 */
 	if (p->if_capabilities & IFCAP_VLAN_HWCSUM)
-		ifp->if_capabilities = p->if_capabilities & IFCAP_HWCSUM;
+		ifp->if_capabilities =
+		    p->if_capabilities & (IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6);
 
 	if (p->if_capenable & IFCAP_VLAN_HWCSUM &&
 	    p->if_capenable & IFCAP_VLAN_HWTAGGING) {
-		ifp->if_capenable = p->if_capenable & IFCAP_HWCSUM;
+		ifp->if_capenable =
+		    p->if_capenable & (IFCAP_HWCSUM | IFCAP_HWCSUM_IPV6);
 		ifp->if_hwassist = p->if_hwassist & (CSUM_IP | CSUM_TCP |
-		    CSUM_UDP | CSUM_SCTP);
+		    CSUM_UDP | CSUM_SCTP | CSUM_TCP_IPV6 | CSUM_UDP_IPV6 |
+		    CSUM_SCTP_IPV6);
 	} else {
 		ifp->if_capenable = 0;
 		ifp->if_hwassist = 0;