Commit da2cfbd3 authored by YueHaibing's avatar YueHaibing Committed by David S. Miller

e1000: remove set but not used variable 'txb2b'

Fixes gcc '-Wunused-but-set-variable' warning:

drivers/net/ethernet/intel/e1000/e1000_main.c: In function 'e1000_watchdog':
drivers/net/ethernet/intel/e1000/e1000_main.c:2436:9: warning:
 variable 'txb2b' set but not used [-Wunused-but-set-variable]
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 684d777a
...@@ -2433,7 +2433,6 @@ static void e1000_watchdog(struct work_struct *work) ...@@ -2433,7 +2433,6 @@ static void e1000_watchdog(struct work_struct *work)
if (link) { if (link) {
if (!netif_carrier_ok(netdev)) { if (!netif_carrier_ok(netdev)) {
u32 ctrl; u32 ctrl;
bool txb2b = true;
/* update snapshot of PHY registers on LSC */ /* update snapshot of PHY registers on LSC */
e1000_get_speed_and_duplex(hw, e1000_get_speed_and_duplex(hw,
&adapter->link_speed, &adapter->link_speed,
...@@ -2455,11 +2454,9 @@ static void e1000_watchdog(struct work_struct *work) ...@@ -2455,11 +2454,9 @@ static void e1000_watchdog(struct work_struct *work)
adapter->tx_timeout_factor = 1; adapter->tx_timeout_factor = 1;
switch (adapter->link_speed) { switch (adapter->link_speed) {
case SPEED_10: case SPEED_10:
txb2b = false;
adapter->tx_timeout_factor = 16; adapter->tx_timeout_factor = 16;
break; break;
case SPEED_100: case SPEED_100:
txb2b = false;
/* maybe add some timeout factor ? */ /* maybe add some timeout factor ? */
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment