diff options
Diffstat (limited to 'drivers/net/ethernet/intel/e1000e/ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/intel/e1000e/ethtool.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/ethtool.c b/drivers/net/ethernet/intel/e1000e/ethtool.c index 6302b10cb3a6..4f1edd9c22f1 100644 --- a/drivers/net/ethernet/intel/e1000e/ethtool.c +++ b/drivers/net/ethernet/intel/e1000e/ethtool.c | |||
| @@ -259,8 +259,7 @@ static int e1000_set_settings(struct net_device *netdev, | |||
| 259 | * cannot be changed | 259 | * cannot be changed |
| 260 | */ | 260 | */ |
| 261 | if (hw->phy.ops.check_reset_block(hw)) { | 261 | if (hw->phy.ops.check_reset_block(hw)) { |
| 262 | e_err("Cannot change link characteristics when SoL/IDER is " | 262 | e_err("Cannot change link characteristics when SoL/IDER is active.\n"); |
| 263 | "active.\n"); | ||
| 264 | return -EINVAL; | 263 | return -EINVAL; |
| 265 | } | 264 | } |
| 266 | 265 | ||
| @@ -727,9 +726,8 @@ static bool reg_pattern_test(struct e1000_adapter *adapter, u64 *data, | |||
| 727 | (test[pat] & write)); | 726 | (test[pat] & write)); |
| 728 | val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset); | 727 | val = E1000_READ_REG_ARRAY(&adapter->hw, reg, offset); |
| 729 | if (val != (test[pat] & write & mask)) { | 728 | if (val != (test[pat] & write & mask)) { |
| 730 | e_err("pattern test reg %04X failed: got 0x%08X " | 729 | e_err("pattern test reg %04X failed: got 0x%08X expected 0x%08X\n", |
| 731 | "expected 0x%08X\n", reg + offset, val, | 730 | reg + offset, val, (test[pat] & write & mask)); |
| 732 | (test[pat] & write & mask)); | ||
| 733 | *data = reg; | 731 | *data = reg; |
| 734 | return 1; | 732 | return 1; |
| 735 | } | 733 | } |
| @@ -744,8 +742,8 @@ static bool reg_set_and_check(struct e1000_adapter *adapter, u64 *data, | |||
| 744 | __ew32(&adapter->hw, reg, write & mask); | 742 | __ew32(&adapter->hw, reg, write & mask); |
| 745 | val = __er32(&adapter->hw, reg); | 743 | val = __er32(&adapter->hw, reg); |
| 746 | if ((write & mask) != (val & mask)) { | 744 | if ((write & mask) != (val & mask)) { |
| 747 | e_err("set/check reg %04X test failed: got 0x%08X " | 745 | e_err("set/check reg %04X test failed: got 0x%08X expected 0x%08X\n", |
| 748 | "expected 0x%08X\n", reg, (val & mask), (write & mask)); | 746 | reg, (val & mask), (write & mask)); |
| 749 | *data = reg; | 747 | *data = reg; |
| 750 | return 1; | 748 | return 1; |
| 751 | } | 749 | } |
| @@ -797,8 +795,8 @@ static int e1000_reg_test(struct e1000_adapter *adapter, u64 *data) | |||
| 797 | ew32(STATUS, toggle); | 795 | ew32(STATUS, toggle); |
| 798 | after = er32(STATUS) & toggle; | 796 | after = er32(STATUS) & toggle; |
| 799 | if (value != after) { | 797 | if (value != after) { |
| 800 | e_err("failed STATUS register test got: 0x%08X expected: " | 798 | e_err("failed STATUS register test got: 0x%08X expected: 0x%08X\n", |
| 801 | "0x%08X\n", after, value); | 799 | after, value); |
| 802 | *data = 1; | 800 | *data = 1; |
| 803 | return 1; | 801 | return 1; |
| 804 | } | 802 | } |
| @@ -1791,8 +1789,7 @@ static void e1000_get_wol(struct net_device *netdev, | |||
| 1791 | wol->supported &= ~WAKE_UCAST; | 1789 | wol->supported &= ~WAKE_UCAST; |
| 1792 | 1790 | ||
| 1793 | if (adapter->wol & E1000_WUFC_EX) | 1791 | if (adapter->wol & E1000_WUFC_EX) |
| 1794 | e_err("Interface does not support directed (unicast) " | 1792 | e_err("Interface does not support directed (unicast) frame wake-up packets\n"); |
| 1795 | "frame wake-up packets\n"); | ||
| 1796 | } | 1793 | } |
| 1797 | 1794 | ||
| 1798 | if (adapter->wol & E1000_WUFC_EX) | 1795 | if (adapter->wol & E1000_WUFC_EX) |