From owner-svn-src-all@FreeBSD.ORG Tue Mar 10 19:18:11 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E97F4106564A; Tue, 10 Mar 2009 19:18:11 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id D78498FC1B; Tue, 10 Mar 2009 19:18:11 +0000 (UTC) (envelope-from sam@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2AJIBQ0071294; Tue, 10 Mar 2009 19:18:11 GMT (envelope-from sam@svn.freebsd.org) Received: (from sam@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n2AJIB08071293; Tue, 10 Mar 2009 19:18:11 GMT (envelope-from sam@svn.freebsd.org) Message-Id: <200903101918.n2AJIB08071293@svn.freebsd.org> From: Sam Leffler Date: Tue, 10 Mar 2009 19:18:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189642 - head/sys/arm/xscale/ixp425 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2009 19:18:12 -0000 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));