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

Commit fe7fe28e authored by Auke Kok's avatar Auke Kok
Browse files

e1000: Made an adapter struct variable into a local (txb2b) 



Made an adapter struct variable into a local (txb2b)


Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJohn Ronciak <john.ronciak@intel.com>
parent e619d523

drivers/net/e1000/e1000.h

+0 −1
Original line number Diff line number Diff line
@@ -334,7 +334,6 @@ struct e1000_adapter { 
	boolean_t have_msi;

#endif

	/* to not mess up cache alignment, always add to the bottom */

	boolean_t txb2b;

#ifdef NETIF_F_TSO

	boolean_t tso_force;

#endif

drivers/net/e1000/e1000_main.c

+5 −5
Original line number Diff line number Diff line
@@ -2247,6 +2247,7 @@ e1000_watchdog_task(struct e1000_adapter *adapter) 


	if (link) {

		if (!netif_carrier_ok(netdev)) {

			boolean_t txb2b = 1;

			e1000_get_speed_and_duplex(&adapter->hw,

			                           &adapter->link_speed,

			                           &adapter->link_duplex);
@@ -2260,15 +2261,14 @@ e1000_watchdog_task(struct e1000_adapter *adapter) 
			 * and adjust the timeout factor */

			netdev->tx_queue_len = adapter->tx_queue_len;

			adapter->tx_timeout_factor = 1;

			adapter->txb2b = 1;

			switch (adapter->link_speed) {

			case SPEED_10:

				adapter->txb2b = 0;

				txb2b = 0;

				netdev->tx_queue_len = 10;

				adapter->tx_timeout_factor = 8;

				break;

			case SPEED_100:

				adapter->txb2b = 0;

				txb2b = 0;

				netdev->tx_queue_len = 100;

				/* maybe add some timeout factor ? */

				break;
@@ -2276,7 +2276,7 @@ e1000_watchdog_task(struct e1000_adapter *adapter) 


			if ((adapter->hw.mac_type == e1000_82571 ||

			     adapter->hw.mac_type == e1000_82572) &&

			    adapter->txb2b == 0) {

			    txb2b == 0) {

#define SPEED_MODE_BIT (1 << 21)

				uint32_t tarc0;

				tarc0 = E1000_READ_REG(&adapter->hw, TARC0);