svn commit: r189642 - head/sys/arm/xscale/ixp425

[Sam Leffler]

Author: sam
Date: Tue Mar 10 19:18:11 2009
New Revision: 189642
URL: http://svn.freebsd.org/changeset/base/189642

Log:
  turn off inclusion of FCS in rx'd frames; we don't use it anywhere and
  dhclient gets annoyed when it receives FCS in frames via bpf

Modified:
  head/sys/arm/xscale/ixp425/if_npe.c

Modified: head/sys/arm/xscale/ixp425/if_npe.c
==============================================================================
--- head/sys/arm/xscale/ixp425/if_npe.c	Tue Mar 10 19:15:35 2009	(r189641)
+++ head/sys/arm/xscale/ixp425/if_npe.c	Tue Mar 10 19:18:11 2009	(r189642)
@@ -1108,7 +1108,6 @@ npe_rxdone(int qid, void *arg)
 			mrx->m_len = be32toh(hw->ix_ne[0].len) & 0xffff;
 			mrx->m_pkthdr.len = mrx->m_len;
 			mrx->m_pkthdr.rcvif = ifp;
-			mrx->m_flags |= M_HASFCS;
 
 			ifp->if_ipackets++;
 			ifp->if_input(ifp, mrx);
@@ -1222,9 +1221,8 @@ if (ifp->if_drv_flags & IFF_DRV_RUNNING)
 		| NPE_TX_CNTRL1_2DEFER		/* 2-part deferal */
 		| NPE_TX_CNTRL1_PAD_EN);	/* pad runt frames */
 	/* XXX pad strip? */
-	WR4(sc, NPE_MAC_RX_CNTRL1,
-		  NPE_RX_CNTRL1_CRC_EN		/* include CRC/FCS */
-		| NPE_RX_CNTRL1_PAUSE_EN);	/* ena pause frame handling */
+	/* ena pause frame handling */
+	WR4(sc, NPE_MAC_RX_CNTRL1, NPE_RX_CNTRL1_PAUSE_EN);
 	WR4(sc, NPE_MAC_RX_CNTRL2, 0);
 
 	npe_setmac(sc, IF_LLADDR(ifp));