Module Name: src
Committed By: msaitoh
Date: Mon Apr 22 08:36:03 UTC 2019
Modified Files:
src/sys/dev/marvell: if_gfe.c
src/sys/dev/pcmcia: if_xi.c
src/sys/dev/usb: if_aue.c
Log Message:
These drivers do ether_ioctl() on SIOC{ADD,DEL}MULTI, SIOC{G,S}IFMEDIA and
default case in the switch statement. Only the default case didn't check the
return value with ENETRESET. Integrate them to one ether_ioctl() with
ENETRESET test. This change might improve some other ioctl()s which return
ENETRESET by calling if_init().
To generate a diff of this commit:
cvs rdiff -u -r1.50 -r1.51 src/sys/dev/marvell/if_gfe.c
cvs rdiff -u -r1.86 -r1.87 src/sys/dev/pcmcia/if_xi.c
cvs rdiff -u -r1.149 -r1.150 src/sys/dev/usb/if_aue.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/marvell/if_gfe.c
diff -u src/sys/dev/marvell/if_gfe.c:1.50 src/sys/dev/marvell/if_gfe.c:1.51
--- src/sys/dev/marvell/if_gfe.c:1.50 Tue Jan 22 03:42:27 2019
+++ src/sys/dev/marvell/if_gfe.c Mon Apr 22 08:36:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_gfe.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $ */
+/* $NetBSD: if_gfe.c,v 1.51 2019/04/22 08:36:03 msaitoh Exp $ */
/*
* Copyright (c) 2002 Allegro Networks, Inc., Wasabi Systems, Inc.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.50 2019/01/22 03:42:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_gfe.c,v 1.51 2019/04/22 08:36:03 msaitoh Exp $");
#include "opt_inet.h"
@@ -656,18 +656,6 @@ gfe_ifioctl(struct ifnet *ifp, u_long cm
}
break;
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
- case SIOCADDMULTI:
- case SIOCDELMULTI:
- if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
- if (ifp->if_flags & IFF_RUNNING)
- error = gfe_whack(sc, GE_WHACK_CHANGE);
- else
- error = 0;
- }
- break;
-
case SIOCSIFMTU:
if (ifr->ifr_mtu > ETHERMTU || ifr->ifr_mtu < ETHERMIN) {
error = EINVAL;
@@ -678,7 +666,12 @@ gfe_ifioctl(struct ifnet *ifp, u_long cm
break;
default:
- error = ether_ioctl(ifp, cmd, data);
+ if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
+ if (ifp->if_flags & IFF_RUNNING)
+ error = gfe_whack(sc, GE_WHACK_CHANGE);
+ else
+ error = 0;
+ }
break;
}
splx(s);
Index: src/sys/dev/pcmcia/if_xi.c
diff -u src/sys/dev/pcmcia/if_xi.c:1.86 src/sys/dev/pcmcia/if_xi.c:1.87
--- src/sys/dev/pcmcia/if_xi.c:1.86 Tue Feb 5 06:17:03 2019
+++ src/sys/dev/pcmcia/if_xi.c Mon Apr 22 08:36:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_xi.c,v 1.86 2019/02/05 06:17:03 msaitoh Exp $ */
+/* $NetBSD: if_xi.c,v 1.87 2019/04/22 08:36:03 msaitoh Exp $ */
/* OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp */
/*
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.86 2019/02/05 06:17:03 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.87 2019/04/22 08:36:03 msaitoh Exp $");
#include "opt_inet.h"
@@ -923,8 +923,7 @@ xi_ioctl(struct ifnet *ifp, u_long cmd,
break;
}
/*FALLTHROUGH*/
- case SIOCSIFMEDIA:
- case SIOCGIFMEDIA:
+ default:
if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
/*
* Multicast list has changed; set the hardware
@@ -935,10 +934,6 @@ xi_ioctl(struct ifnet *ifp, u_long cmd,
error = 0;
}
break;
-
- default:
- error = ether_ioctl(ifp, cmd, data);
- break;
}
splx(s);
Index: src/sys/dev/usb/if_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.149 src/sys/dev/usb/if_aue.c:1.150
--- src/sys/dev/usb/if_aue.c:1.149 Thu Apr 11 09:16:56 2019
+++ src/sys/dev/usb/if_aue.c Mon Apr 22 08:36:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_aue.c,v 1.149 2019/04/11 09:16:56 msaitoh Exp $ */
+/* $NetBSD: if_aue.c,v 1.150 2019/04/22 08:36:03 msaitoh Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.149 2019/04/11 09:16:56 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.150 2019/04/22 08:36:03 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1585,10 +1585,7 @@ aue_ioctl(struct ifnet *ifp, u_long comm
sc->aue_if_flags = ifp->if_flags;
error = 0;
break;
- case SIOCADDMULTI:
- case SIOCDELMULTI:
- case SIOCGIFMEDIA:
- case SIOCSIFMEDIA:
+ default:
if ((error = ether_ioctl(ifp, command, data)) == ENETRESET) {
if (ifp->if_flags & IFF_RUNNING) {
cv_signal(&sc->aue_domc);
@@ -1596,9 +1593,6 @@ aue_ioctl(struct ifnet *ifp, u_long comm
error = 0;
}
break;
- default:
- error = ether_ioctl(ifp, command, data);
- break;
}
splx(s);
