diff options
| author | imp <imp@FreeBSD.org> | 2009-09-08 16:37:18 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2009-09-08 16:37:18 +0000 |
| commit | abcc9b4e4ee4aaab6cbdb737804d885e06bf14c1 (patch) | |
| tree | eaca5e8e993be9250b2e3844bdff17ef1bae3f04 /sys/dev/ep/if_ep.c | |
| parent | d54317171d2bd5c377b27abbd47a753849e736ab (diff) | |
| download | FreeBSD-src-abcc9b4e4ee4aaab6cbdb737804d885e06bf14c1.zip FreeBSD-src-abcc9b4e4ee4aaab6cbdb737804d885e06bf14c1.tar.gz | |
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.
Diffstat (limited to 'sys/dev/ep/if_ep.c')
| -rw-r--r-- | sys/dev/ep/if_ep.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/dev/ep/if_ep.c b/sys/dev/ep/if_ep.c index f5fd475..c5b516c 100644 --- a/sys/dev/ep/if_ep.c +++ b/sys/dev/ep/if_ep.c @@ -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); |
