Date: Tue, 8 Sep 2009 16:37:19 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r196984 - head/sys/dev/ep Message-ID: <200909081637.n88GbJeq053589@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: imp Date: Tue Sep 8 16:37:18 2009 New Revision: 196984 URL: http://svn.freebsd.org/changeset/base/196984 Log: Cleanup tortured logic a big. Noticed by FlexLint, per phk. # My reading of the docs suggests this can only happen on 10Base5 and # 10Base2 setups (and maybe only the former), which I can't test # adequately since I have nothing but 10BaseT, etc here. Modified: head/sys/dev/ep/if_ep.c Modified: head/sys/dev/ep/if_ep.c ============================================================================== --- head/sys/dev/ep/if_ep.c Tue Sep 8 16:09:28 2009 (r196983) +++ head/sys/dev/ep/if_ep.c Tue Sep 8 16:37:18 2009 (r196984) @@ -665,14 +665,13 @@ rescan: #ifdef EP_LOCAL_STATS sc->tx_underrun++; #endif - } else { - if (status & TXS_JABBER); - else - ++ifp->if_collisions; - /* TXS_MAX_COLLISION - * we shouldn't get - * here - */ + } + if (status & TXS_MAX_COLLISION) { + /* + * TXS_MAX_COLLISION we + * shouldn't get here + */ + ++ifp->if_collisions; } ++ifp->if_oerrors; CSR_WRITE_2(sc, EP_COMMAND, TX_ENABLE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200909081637.n88GbJeq053589>