A handler for ioctl(SIOCSIFCAP) should not alter a bit in

if_capenable unless the interface driver is actually able
to toggle the respective capability on and off.

Reviewed by:	ru

8 files changed, 17 insertions, 8 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index 01ac05a..0130b9d 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -3708,7 +3708,8 @@ dc_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 #endif
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 8a49329..d130c1d 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -2496,7 +2496,8 @@ fxp_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 		break;
 
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 
 	default:
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index 82b654d..0aa8b85 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -2167,7 +2167,8 @@ nge_ioctl(ifp, command, data)
 		}
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 440a5be..c28728f 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -2315,7 +2315,9 @@ re_ioctl(ifp, command, data)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~(IFCAP_HWCSUM | IFCAP_POLLING);
+		ifp->if_capenable |=
+		    ifr->ifr_reqcap & (IFCAP_HWCSUM | IFCAP_POLLING);
 		if (ifp->if_capenable & IFCAP_TXCSUM)
 			ifp->if_hwassist = RE_CSUM_FEATURES;
 		else
diff --git a/sys/pci/if_dc.c b/sys/pci/if_dc.c
index 01ac05a..0130b9d 100644
--- a/sys/pci/if_dc.c
+++ b/sys/pci/if_dc.c
@@ -3708,7 +3708,8 @@ dc_ioctl(struct ifnet *ifp, u_long command, caddr_t data)
 #endif
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
diff --git a/sys/pci/if_rl.c b/sys/pci/if_rl.c
index eee7976..5f0d0d2 100644
--- a/sys/pci/if_rl.c
+++ b/sys/pci/if_rl.c
@@ -1830,7 +1830,8 @@ rl_ioctl(ifp, command, data)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
diff --git a/sys/pci/if_sis.c b/sys/pci/if_sis.c
index 8aef8db..f8c92c9 100644
--- a/sys/pci/if_sis.c
+++ b/sys/pci/if_sis.c
@@ -2340,7 +2340,8 @@ sis_ioctl(ifp, command, data)
 		SIS_UNLOCK(sc);
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);
diff --git a/sys/pci/if_ste.c b/sys/pci/if_ste.c
index 2d3f6dc..5f0e013 100644
--- a/sys/pci/if_ste.c
+++ b/sys/pci/if_ste.c
@@ -1555,7 +1555,8 @@ ste_ioctl(ifp, command, data)
 		error = ifmedia_ioctl(ifp, ifr, &mii->mii_media, command);
 		break;
 	case SIOCSIFCAP:
-		ifp->if_capenable = ifr->ifr_reqcap;
+		ifp->if_capenable &= ~IFCAP_POLLING;
+		ifp->if_capenable |= ifr->ifr_reqcap & IFCAP_POLLING;
 		break;
 	default:
 		error = ether_ioctl(ifp, command, data);