summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrad Smith <brad@cvs.openbsd.org>2006-08-04 05:01:01 +0000
committerBrad Smith <brad@cvs.openbsd.org>2006-08-04 05:01:01 +0000
commitbfdbbca5b52fa67a89069ffb7ea02747939cc460 (patch)
tree7c049838a9619e8e19059c5ccea06b8925494723 /sys/dev
parentd4741651368bf3da3bd43a993240398dea08f07e (diff)
remove now redundant promiscuous mode handling code from sk_init_xmac().
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/pci/if_sk.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/pci/if_sk.c b/sys/dev/pci/if_sk.c
index 2468ec431fb..8e011ce8f97 100644
--- a/sys/dev/pci/if_sk.c
+++ b/sys/dev/pci/if_sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_sk.c,v 1.120 2006/08/04 04:44:37 brad Exp $ */
+/* $OpenBSD: if_sk.c,v 1.121 2006/08/04 05:01:00 brad Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2000
@@ -2418,11 +2418,6 @@ sk_init_xmac(struct sk_if_softc *sc_if)
*(u_int16_t *)(&sc_if->arpcom.ac_enaddr[4]));
SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_USE_STATION);
- if (ifp->if_flags & IFF_PROMISC)
- SK_XM_SETBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
- else
- SK_XM_CLRBIT_4(sc_if, XM_MODE, XM_MODE_RX_PROMISC);
-
if (ifp->if_flags & IFF_BROADCAST)
SK_XM_CLRBIT_4(sc_if, XM_MODE, XM_MODE_RX_NOBROAD);
else