diff options
author | Dan Williams <dcbw@redhat.com> | 2007-04-25 21:30:29 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-04-27 20:16:41 -0400 |
commit | 1764f15016fea54db723a96234a82646dac9a036 (patch) | |
tree | efed9a20fb0ad0d9c9483bea8b4049d461503d9c /drivers/usb/net/pegasus.c | |
parent | f00546363fff1576ceddc2690d47e5f9c1dd2e05 (diff) |
usb-net/pegasus: simplify carrier detection
Simplify pegasus carrier detection; rely only on the periodic MII
polling. Reverts pieces of c43c49bd61fdb9bb085ddafcaadb17d06f95ec43.
Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/usb/net/pegasus.c')
-rw-r--r-- | drivers/usb/net/pegasus.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/usb/net/pegasus.c b/drivers/usb/net/pegasus.c index 1ad4ee54b186..a05fd97e5bc2 100644 --- a/drivers/usb/net/pegasus.c +++ b/drivers/usb/net/pegasus.c @@ -847,16 +847,6 @@ static void intr_callback(struct urb *urb) * d[0].NO_CARRIER kicks in only with failed TX. * ... so monitoring with MII may be safest. */ - if (pegasus->features & TRUST_LINK_STATUS) { - if (d[5] & LINK_STATUS) - netif_carrier_on(net); - else - netif_carrier_off(net); - } else { - /* Never set carrier _on_ based on ! NO_CARRIER */ - if (d[0] & NO_CARRIER) - netif_carrier_off(net); - } /* bytes 3-4 == rx_lostpkt, reg 2E/2F */ pegasus->stats.rx_missed_errors += ((d[3] & 0x7f) << 8) | d[4]; |