[src/trunk]: src/sys/dev/pci Don't turn promisc off in vioif_deferred_init if...

[ozaki-r <ozaki-r%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/585ce5936ead
branches:  trunk
changeset: 332764:585ce5936ead
user:      ozaki-r <ozaki-r%NetBSD.org@localhost>
date:      Wed Oct 08 01:45:14 2014 +0000

description:
Don't turn promisc off in vioif_deferred_init if already configured as promisc

diffstat:

 sys/dev/pci/if_vioif.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 4b71847af00a -r 585ce5936ead sys/dev/pci/if_vioif.c
--- a/sys/dev/pci/if_vioif.c    Tue Oct 07 22:39:32 2014 +0000
+++ b/sys/dev/pci/if_vioif.c    Wed Oct 08 01:45:14 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vioif.c,v 1.8 2014/08/13 14:35:46 pooka Exp $       */
+/*     $NetBSD: if_vioif.c,v 1.9 2014/10/08 01:45:14 ozaki-r Exp $     */
 
 /*
  * Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.8 2014/08/13 14:35:46 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.9 2014/10/08 01:45:14 ozaki-r Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -650,12 +650,13 @@
        struct ifnet *ifp = &sc->sc_ethercom.ec_if;
        int r;
 
+       if (ifp->if_flags & IFF_PROMISC)
+               return
+
        r =  vioif_set_promisc(sc, false);
        if (r != 0)
                aprint_error_dev(self, "resetting promisc mode failed, "
                                 "errror code %d\n", r);
-       else
-               ifp->if_flags &= ~IFF_PROMISC;
 }
 
 /*