Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9669f53b authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000: display flow control of link status at link up 



Print RX/TX flow control setting at link up time to display the
actual link FC properties instead of the advertised values.

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
parent 60cba200

drivers/net/e1000/e1000_main.c

+11 −4
Original line number Original line Diff line number Diff line
@@ -2583,15 +2583,22 @@ e1000_watchdog(unsigned long data) 




	if (link) {

	if (link) {

		if (!netif_carrier_ok(netdev)) {

		if (!netif_carrier_ok(netdev)) {

			uint32_t ctrl;

			boolean_t txb2b = 1;

			boolean_t txb2b = 1;

			e1000_get_speed_and_duplex(&adapter->hw,

			e1000_get_speed_and_duplex(&adapter->hw,

			                           &adapter->link_speed,

			                           &adapter->link_speed,

			                           &adapter->link_duplex);

			                           &adapter->link_duplex);





			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s\n",

			ctrl = E1000_READ_REG(&adapter->hw, CTRL);

			DPRINTK(LINK, INFO, "NIC Link is Up %d Mbps %s, "

			        "Flow Control: %s\n",

			        adapter->link_speed,

			        adapter->link_speed,

			        adapter->link_duplex == FULL_DUPLEX ?

			        adapter->link_duplex == FULL_DUPLEX ?

			       "Full Duplex" : "Half Duplex");

			        "Full Duplex" : "Half Duplex",

			        ((ctrl & E1000_CTRL_TFCE) && (ctrl &

			        E1000_CTRL_RFCE)) ? "RX/TX" : ((ctrl &

			        E1000_CTRL_RFCE) ? "RX" : ((ctrl &

			        E1000_CTRL_TFCE) ? "TX" : "None" )));





			/* tweak tx_queue_len according to speed/duplex

			/* tweak tx_queue_len according to speed/duplex

			 * and adjust the timeout factor */

			 * and adjust the timeout factor */