diff options
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/e1000_82575.c | 2 | ||||
-rw-r--r-- | drivers/net/igb/igb_main.c | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/drivers/net/igb/e1000_82575.c b/drivers/net/igb/e1000_82575.c index 3ef495537dc5..86438b59fa21 100644 --- a/drivers/net/igb/e1000_82575.c +++ b/drivers/net/igb/e1000_82575.c | |||
@@ -1214,8 +1214,6 @@ void igb_power_down_phy_copper_82575(struct e1000_hw *hw) | |||
1214 | /* If the management interface is not enabled, then power down */ | 1214 | /* If the management interface is not enabled, then power down */ |
1215 | if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw))) | 1215 | if (!(igb_enable_mng_pass_thru(hw) || igb_check_reset_block(hw))) |
1216 | igb_power_down_phy_copper(hw); | 1216 | igb_power_down_phy_copper(hw); |
1217 | |||
1218 | return; | ||
1219 | } | 1217 | } |
1220 | 1218 | ||
1221 | /** | 1219 | /** |
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 589cf4a6427a..3881918f5382 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -1054,7 +1054,6 @@ msi_only: | |||
1054 | out: | 1054 | out: |
1055 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ | 1055 | /* Notify the stack of the (possibly) reduced Tx Queue count. */ |
1056 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; | 1056 | adapter->netdev->real_num_tx_queues = adapter->num_tx_queues; |
1057 | return; | ||
1058 | } | 1057 | } |
1059 | 1058 | ||
1060 | /** | 1059 | /** |
@@ -3717,8 +3716,6 @@ set_itr_now: | |||
3717 | q_vector->itr_val = new_itr; | 3716 | q_vector->itr_val = new_itr; |
3718 | q_vector->set_itr = 1; | 3717 | q_vector->set_itr = 1; |
3719 | } | 3718 | } |
3720 | |||
3721 | return; | ||
3722 | } | 3719 | } |
3723 | 3720 | ||
3724 | #define IGB_TX_FLAGS_CSUM 0x00000001 | 3721 | #define IGB_TX_FLAGS_CSUM 0x00000001 |