aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Tantilov <emil.s.tantilov@intel.com>2013-04-19 05:31:17 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2013-04-25 23:38:28 -0400
commitc4a56de88c6cd9996fb5dc7576d6c4934b5e6465 (patch)
treed3fa82e18c36ea2a768a8da5d1f1501eee20674d
parent46d5ceddd282262267abecd70c5ed6f5bdce0f92 (diff)
ixgbe: add mac type to the version in ethtool_regs
This patch adds the mac type to the version in ethtool_regs. This will make it easier to check the mac type when dumping registers with ethtool. The drawback of this is that older versions of ethtool will only be able to dump in hex format for 82599 and above when used with the updated driver. Signed-off-by: Emil Tantilov <emil.s.tantilov@intel.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
-rw-r--r--drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
index 509d3ae191f3..d3754722adb4 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c
@@ -440,7 +440,8 @@ static void ixgbe_get_regs(struct net_device *netdev,
440 440
441 memset(p, 0, IXGBE_REGS_LEN * sizeof(u32)); 441 memset(p, 0, IXGBE_REGS_LEN * sizeof(u32));
442 442
443 regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id; 443 regs->version = hw->mac.type << 24 | hw->revision_id << 16 |
444 hw->device_id;
444 445
445 /* General Registers */ 446 /* General Registers */
446 regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL); 447 regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL);