[src/netbsd-7]: src/sys/arch/x86/pci Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/71865e1079c3
branches:  netbsd-7
changeset: 798243:71865e1079c3
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Aug 14 06:52:38 2014 +0000

description:
Pull up following revision(s) (requested by hikaru in ticket #15):
        sys/arch/x86/pci/if_vmx.c: revision 1.5
Set ifflags callback so that the device can enter promiscuous mode.

diffstat:

 sys/arch/x86/pci/if_vmx.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r 2506fb8e074f -r 71865e1079c3 sys/arch/x86/pci/if_vmx.c
--- a/sys/arch/x86/pci/if_vmx.c Thu Aug 14 06:50:37 2014 +0000
+++ b/sys/arch/x86/pci/if_vmx.c Thu Aug 14 06:52:38 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_vmx.c,v 1.4 2014/07/19 06:12:24 hikaru Exp $        */
+/*     $NetBSD: if_vmx.c,v 1.4.4.1 2014/08/14 06:52:38 martin Exp $    */
 /*     $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $        */
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.4 2014/07/19 06:12:24 hikaru Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.4.4.1 2014/08/14 06:52:38 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -158,6 +158,7 @@
 void vmxnet3_txintr(struct vmxnet3_softc *, struct vmxnet3_txqueue *);
 void vmxnet3_rxintr(struct vmxnet3_softc *, struct vmxnet3_rxqueue *);
 void vmxnet3_iff(struct vmxnet3_softc *);
+int vmxnet3_ifflags_cb(struct ethercom *);
 void vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *, struct mbuf *);
 int vmxnet3_getbuf(struct vmxnet3_softc *, struct vmxnet3_rxring *);
 void vmxnet3_stop(struct ifnet *, int disable);
@@ -308,6 +309,7 @@
 
        if_attach(ifp);
        ether_ifattach(ifp, enaddr);
+       ether_set_ifflags_cb(&sc->sc_ethercom, vmxnet3_ifflags_cb);
        vmxnet3_link_state(sc);
 }
 
@@ -859,6 +861,15 @@
        WRITE_CMD(sc, VMXNET3_CMD_SET_RXMODE);
 }
 
+int
+vmxnet3_ifflags_cb(struct ethercom *ec)
+{
+
+       vmxnet3_iff((struct vmxnet3_softc *)ec->ec_if.if_softc);
+
+       return 0;
+}
+
 
 void
 vmxnet3_rx_csum(struct vmxnet3_rxcompdesc *rxcd, struct mbuf *m)