From: Emil Tantilov Date: Fri, 19 Apr 2013 09:31:17 +0000 (+0000) Subject: ixgbe: add mac type to the version in ethtool_regs X-Git-Tag: MMI-PSA29.97-13-9~14469^2~19^2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c4a56de88c6cd9996fb5dc7576d6c4934b5e6465;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git 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 Tested-by: Phil Schmitt Signed-off-by: Jeff Kirsher --- 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, memset(p, 0, IXGBE_REGS_LEN * sizeof(u32)); - regs->version = (1 << 24) | hw->revision_id << 16 | hw->device_id; + regs->version = hw->mac.type << 24 | hw->revision_id << 16 | + hw->device_id; /* General Registers */ regs_buff[0] = IXGBE_READ_REG(hw, IXGBE_CTRL);