summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorarybchik <arybchik@FreeBSD.org>2015-05-21 09:13:47 +0000
committerarybchik <arybchik@FreeBSD.org>2015-05-21 09:13:47 +0000
commit41bc1c612cdd4b49d7bf664228cff576eb924b0e (patch)
tree164b9fed89afb3a570cb5489e9066ed6a297fc0c /sys
parent700f83961eb76927b3b326ccadd72bc34f5fa29d (diff)
downloadFreeBSD-src-41bc1c612cdd4b49d7bf664228cff576eb924b0e.zip
FreeBSD-src-41bc1c612cdd4b49d7bf664228cff576eb924b0e.tar.gz
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.
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/sfxge/sfxge.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/sys/dev/sfxge/sfxge.c b/sys/dev/sfxge/sfxge.c
index 97353ee2..32bf75f 100644
--- a/sys/dev/sfxge/sfxge.c
+++ b/sys/dev/sfxge/sfxge.c
@@ -257,26 +257,36 @@ sfxge_if_ioctl(struct ifnet *ifp, unsigned long command, caddr_t data)
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, unsigned long command, caddr_t data)
* 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);
OpenPOWER on IntegriCloud