[src/netbsd-1-6]: src/sys/dev/pcmcia Pull up revision 1.28 (requested by bouy...

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

details:   https://anonhg.NetBSD.org/src/rev/be4cf5e59868
branches:  netbsd-1-6
changeset: 530480:be4cf5e59868
user:      grant <grant%NetBSD.org@localhost>
date:      Mon Jun 30 02:49:41 2003 +0000

description:
Pull up revision 1.28 (requested by bouyer in ticket #1351):

The driver puts the adapter in promisc mode to receive multicast addresses.
At last set the IFF_PROMISC flag so that the upper layer filters frames
that are not for us.

diffstat:

 sys/dev/pcmcia/if_xi.c |  7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 0b30b3ee88bd -r be4cf5e59868 sys/dev/pcmcia/if_xi.c
--- a/sys/dev/pcmcia/if_xi.c    Mon Jun 30 02:48:02 2003 +0000
+++ b/sys/dev/pcmcia/if_xi.c    Mon Jun 30 02:49:41 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_xi.c,v 1.21.4.1 2002/10/02 02:56:55 lukem Exp $ */
+/*     $NetBSD: if_xi.c,v 1.21.4.2 2003/06/30 02:49:41 grant Exp $ */
 /*     OpenBSD: if_xe.c,v 1.9 1999/09/16 11:28:42 niklas Exp   */
 
 /*
@@ -49,7 +49,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.21.4.1 2002/10/02 02:56:55 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xi.c,v 1.21.4.2 2003/06/30 02:49:41 grant Exp $");
 
 #include "opt_inet.h"
 #include "bpfilter.h"
@@ -1514,9 +1514,7 @@
        bus_space_handle_t bsh = sc->sc_bsh;
        bus_addr_t offset = sc->sc_offset;
        struct ethercom *ether = &sc->sc_ethercom;
-#if 0
        struct ifnet *ifp = &sc->sc_ethercom.ec_if;
-#endif
 #if WORKING_MULTICAST
        struct ether_multistep step;
        struct ether_multi *enm;
@@ -1542,6 +1540,7 @@
                        bus_space_write_1(sc->sc_bst, sc->sc_bsh,
                            sc->sc_offset + SWC1,
                            SWC1_PROMISC | SWC1_MCAST_PROM);
+                       ifp->if_flags |= IFF_PROMISC;
                        return;
                }