Commit f89271dd authored by Bruce Allan's avatar Bruce Allan Committed by David S. Miller

e1000e: add missing tests for 82583 in ethtool functions

Add tests for 82583 in a couple ethtool functions that were missed from the
initial hardware enablement submission.
Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1fbfca32
...@@ -604,7 +604,9 @@ static int e1000_set_eeprom(struct net_device *netdev, ...@@ -604,7 +604,9 @@ static int e1000_set_eeprom(struct net_device *netdev,
* and flush shadow RAM for applicable controllers * and flush shadow RAM for applicable controllers
*/ */
if ((first_word <= NVM_CHECKSUM_REG) || if ((first_word <= NVM_CHECKSUM_REG) ||
(hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82573)) (hw->mac.type == e1000_82583) ||
(hw->mac.type == e1000_82574) ||
(hw->mac.type == e1000_82573))
ret_val = e1000e_update_nvm_checksum(hw); ret_val = e1000e_update_nvm_checksum(hw);
out: out:
...@@ -1839,6 +1841,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data) ...@@ -1839,6 +1841,7 @@ static int e1000_phys_id(struct net_device *netdev, u32 data)
if ((hw->phy.type == e1000_phy_ife) || if ((hw->phy.type == e1000_phy_ife) ||
(hw->mac.type == e1000_pchlan) || (hw->mac.type == e1000_pchlan) ||
(hw->mac.type == e1000_82583) ||
(hw->mac.type == e1000_82574)) { (hw->mac.type == e1000_82574)) {
INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task); INIT_WORK(&adapter->led_blink_task, e1000e_led_blink_task);
if (!adapter->blink_timer.function) { if (!adapter->blink_timer.function) {
......
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