svn commit: r185249 - in stable/7/sys: . dev/vr modules/cxgb

[Pyun YongHyeon]

Author: yongari
Date: Mon Nov 24 11:22:25 2008
New Revision: 185249
URL: http://svn.freebsd.org/changeset/base/185249

Log:
  MFC r185014:
    Fix typo. It restuled in activating unwanted Rx filtering as well
    as resetting Rx threshold configuration.
  
    Submitted by:	Joost Mulders < Joost.Mulders <> Sun DOT COM >
    Approved by:  re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/dev/vr/if_vr.c
  stable/7/sys/modules/cxgb/   (props changed)

Modified: stable/7/sys/dev/vr/if_vr.c
==============================================================================
--- stable/7/sys/dev/vr/if_vr.c	Mon Nov 24 11:07:25 2008	(r185248)
+++ stable/7/sys/dev/vr/if_vr.c	Mon Nov 24 11:22:25 2008	(r185249)
@@ -465,7 +465,8 @@ vr_set_filter(struct vr_softc *sc)
 
 	ifp = sc->vr_ifp;
 	rxfilt = CSR_READ_1(sc, VR_RXCFG);
-	rxfilt = ~(VR_RXCFG_RX_PROMISC | VR_RXCFG_RX_BROAD | VR_RXCFG_RX_MULTI);
+	rxfilt &= ~(VR_RXCFG_RX_PROMISC | VR_RXCFG_RX_BROAD |
+	    VR_RXCFG_RX_MULTI);
 	if (ifp->if_flags & IFF_BROADCAST)
 		rxfilt |= VR_RXCFG_RX_BROAD;
 	if (ifp->if_flags & IFF_ALLMULTI || ifp->if_flags & IFF_PROMISC) {