From 67191b8d7ceea1ea67eff094ed3bc3050ce8b7a0 Mon Sep 17 00:00:00 2001 From: yongari Date: Sat, 19 Mar 2011 22:36:59 +0000 Subject: [PATCH] Correct broadcast frame handling. Setting bit6 of MCR0 register enables broadcast filtering. Make sure to clear the bit to receive broadcast frames. While I'm here rename the bit definition to reflect reality. Reported by: brad@OpenBSD MFC after: 1 week --- sys/dev/vte/if_vte.c | 5 +++-- sys/dev/vte/if_vtereg.h | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/dev/vte/if_vte.c b/sys/dev/vte/if_vte.c index 63c751a506c5..5dec0f4529a8 100644 --- a/sys/dev/vte/if_vte.c +++ b/sys/dev/vte/if_vte.c @@ -1963,9 +1963,10 @@ vte_rxfilter(struct vte_softc *sc) } mcr = CSR_READ_2(sc, VTE_MCR0); - mcr &= ~(MCR0_PROMISC | MCR0_BROADCAST | MCR0_MULTICAST); + mcr &= ~(MCR0_PROMISC | MCR0_MULTICAST); + mcr |= MCR0_BROADCAST_DIS; if ((ifp->if_flags & IFF_BROADCAST) != 0) - mcr |= MCR0_BROADCAST; + mcr &= ~MCR0_BROADCAST_DIS; if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) { if ((ifp->if_flags & IFF_PROMISC) != 0) mcr |= MCR0_PROMISC; diff --git a/sys/dev/vte/if_vtereg.h b/sys/dev/vte/if_vtereg.h index 0c4b19f202d6..536617b88c1a 100644 --- a/sys/dev/vte/if_vtereg.h +++ b/sys/dev/vte/if_vtereg.h @@ -48,7 +48,7 @@ #define MCR0_ACCPT_LONG_PKT 0x0008 #define MCR0_ACCPT_DRIBBLE 0x0010 #define MCR0_PROMISC 0x0020 -#define MCR0_BROADCAST 0x0040 +#define MCR0_BROADCAST_DIS 0x0040 #define MCR0_RX_EARLY_INTR 0x0080 #define MCR0_MULTICAST 0x0100 #define MCR0_FC_ENB 0x0200