svn commit: r283212 - stable/10/sys/dev/sfxge

[Andrew Rybchenko]

Author: arybchik
Date: Thu May 21 09:13:47 2015
New Revision: 283212
URL: https://svnweb.freebsd.org/changeset/base/283212

Log:
  MFC: r283000
  
  sfxge: add local variable with changed capabilities mask
  
  It is required for the next patch which adds dependency of TSO
  capabilities from Tx checksum offloads.
  
  Sponsored by:   Solarflare Communications, Inc.

Modified:
  stable/10/sys/dev/sfxge/sfxge.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/sfxge/sfxge.c
==============================================================================
--- stable/10/sys/dev/sfxge/sfxge.c	Thu May 21 09:12:25 2015	(r283211)
+++ stable/10/sys/dev/sfxge/sfxge.c	Thu May 21 09:13:47 2015	(r283212)
@@ -257,26 +257,36 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign
 			sfxge_mac_filter_set(sc);
 		break;
 	case SIOCSIFCAP:
+	{
+		int reqcap = ifr->ifr_reqcap;
+		int capchg_mask;
+
 		SFXGE_ADAPTER_LOCK(sc);
 
+		/* Capabilities to be changed in accordance with request */
+		capchg_mask = ifp->if_capenable ^ reqcap;
+
 		/*
 		 * The networking core already rejects attempts to
 		 * enable capabilities we don't have.  We still have
 		 * to reject attempts to disable capabilities that we
 		 * can't (yet) disable.
 		 */
-		if (~ifr->ifr_reqcap & SFXGE_CAP_FIXED) {
+		KASSERT((reqcap & ~ifp->if_capabilities) == 0,
+		    ("Unsupported capabilities %x requested %x vs %x",
+		     reqcap & ~ifp->if_capabilities,
+		     reqcap , ifp->if_capabilities));
+		if (capchg_mask & SFXGE_CAP_FIXED) {
 			error = EINVAL;
 			SFXGE_ADAPTER_UNLOCK(sc);
 			break;
 		}
 
-		ifp->if_capenable = ifr->ifr_reqcap;
-		if (ifp->if_capenable & IFCAP_TXCSUM)
+		if (reqcap & IFCAP_TXCSUM)
 			ifp->if_hwassist |= (CSUM_IP | CSUM_TCP | CSUM_UDP);
 		else
 			ifp->if_hwassist &= ~(CSUM_IP | CSUM_TCP | CSUM_UDP);
-		if (ifp->if_capenable & IFCAP_TXCSUM_IPV6)
+		if (reqcap & IFCAP_TXCSUM_IPV6)
 			ifp->if_hwassist |= (CSUM_TCP_IPV6 | CSUM_UDP_IPV6);
 		else
 			ifp->if_hwassist &= ~(CSUM_TCP_IPV6 | CSUM_UDP_IPV6);
@@ -289,8 +299,11 @@ sfxge_if_ioctl(struct ifnet *ifp, unsign
 		 * but both bits are set in IPv4 and IPv6 mbufs.
 		 */
 
+		ifp->if_capenable = reqcap;
+
 		SFXGE_ADAPTER_UNLOCK(sc);
 		break;
+	}
 	case SIOCSIFMEDIA:
 	case SIOCGIFMEDIA:
 		error = ifmedia_ioctl(ifp, ifr, &sc->media, command);