[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <46329286.8050708@garzik.org>
Date: Fri, 27 Apr 2007 20:17:10 -0400
From: Jeff Garzik <jeff@...zik.org>
To: Dan Williams <dcbw@...hat.com>
CC: Petko Manolov <petkan@...leusys.com>, Greg KH <greg@...ah.com>,
netdev@...r.kernel.org
Subject: Re: [PATCH] usb-net/pegasus: simplify carrier detection
Dan Williams wrote:
> Simplify pegasus carrier detection; rely only on the periodic MII
> polling. Reverts pieces of c43c49bd61fdb9bb085ddafcaadb17d06f95ec43.
>
> Signed-off-by: Dan Williams <dcbw@...hat.com>
>
> --- a/drivers/usb/net/pegasus.h 2007-04-25 21:21:00.000000000 -0400
> +++ b/drivers/usb/net/pegasus.h 2007-04-25 21:21:13.000000000 -0400
> @@ -11,7 +11,6 @@
>
> #define PEGASUS_II 0x80000000
> #define HAS_HOME_PNA 0x40000000
> -#define TRUST_LINK_STATUS 0x20000000
>
> #define PEGASUS_MTU 1536
> #define RX_SKBS 4
> @@ -204,7 +203,7 @@
> PEGASUS_DEV( "Allied Telesyn Int. AT-USB100", VENDOR_ALLIEDTEL, 0xb100,
> DEFAULT_GPIO_RESET | PEGASUS_II )
> PEGASUS_DEV( "Belkin F5D5050 USB Ethernet", VENDOR_BELKIN, 0x0121,
> - DEFAULT_GPIO_RESET | PEGASUS_II | TRUST_LINK_STATUS )
> + DEFAULT_GPIO_RESET | PEGASUS_II )
> PEGASUS_DEV( "Billionton USB-100", VENDOR_BILLIONTON, 0x0986,
> DEFAULT_GPIO_RESET )
> PEGASUS_DEV( "Billionton USBLP-100", VENDOR_BILLIONTON, 0x0987,
> --- a/drivers/usb/net/pegasus.c 2007-04-25 21:20:32.000000000 -0400
> +++ b/drivers/usb/net/pegasus.c 2007-04-25 21:22:15.000000000 -0400
> @@ -848,16 +848,6 @@
> * 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];
applied
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists