[src/trunk]: src/sys/arch/mips/sibyte/dev This driver does ether_ioctl() on S...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cc2a2cb9f005
branches:  trunk
changeset: 998581:cc2a2cb9f005
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Apr 22 08:39:10 2019 +0000

description:
This driver does 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() call with
ENETRESET test. This driver might require some additional fixes for SIOCSIFMTU
and other ioctl()s.

diffstat:

 sys/arch/mips/sibyte/dev/sbmac.c |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (39 lines):

diff -r b629e7e366e3 -r cc2a2cb9f005 sys/arch/mips/sibyte/dev/sbmac.c
--- a/sys/arch/mips/sibyte/dev/sbmac.c  Mon Apr 22 08:36:03 2019 +0000
+++ b/sys/arch/mips/sibyte/dev/sbmac.c  Mon Apr 22 08:39:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sbmac.c,v 1.56 2019/03/31 12:47:33 simonb Exp $ */
+/* $NetBSD: sbmac.c,v 1.57 2019/04/22 08:39:10 msaitoh Exp $ */
 
 /*
  * Copyright 2000, 2001, 2004
@@ -33,7 +33,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.56 2019/03/31 12:47:33 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.57 2019/04/22 08:39:10 msaitoh Exp $");
 
 #include "opt_inet.h"
 #include "opt_ns.h"
@@ -2026,19 +2026,13 @@
                error = 0;
                break;
 
-       case SIOCADDMULTI:
-       case SIOCDELMULTI:
-       case SIOCSIFMEDIA:
-       case SIOCGIFMEDIA:
+       default:
                if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
                        error = 0;
                        if (ifp->if_flags & IFF_RUNNING)
                                sbmac_setmulti(sc);
                }
                break;
-       default:
-               error = ether_ioctl(ifp, cmd, data);
-               break;
        }
 
        (void)splx(s);