From 37349c75fb034a481bf75e620883094845e1d5bc Mon Sep 17 00:00:00 2001 From: Malli Chilakala Date: Thu, 28 Apr 2005 19:04:07 -0700 Subject: [PATCH] --- yaml --- r: 1381 b: refs/heads/master c: 5e3c30deb21d0eb0da44830fb1c1fc7054e54229 h: refs/heads/master i: 1379: 62664affb1d1eb51be969b5dbf401f1baa8ecdb7 v: v3 --- [refs] | 2 +- trunk/drivers/net/ixgb/ixgb_ethtool.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a9a84c10bbb7..17919e8ec6bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf481d6af8670c89f33f354c6fbd9977b23cebc +refs/heads/master: 5e3c30deb21d0eb0da44830fb1c1fc7054e54229 diff --git a/trunk/drivers/net/ixgb/ixgb_ethtool.c b/trunk/drivers/net/ixgb/ixgb_ethtool.c index aea10e8aaa72..3fa113854eeb 100644 --- a/trunk/drivers/net/ixgb/ixgb_ethtool.c +++ b/trunk/drivers/net/ixgb/ixgb_ethtool.c @@ -252,7 +252,9 @@ ixgb_get_regs(struct net_device *netdev, uint32_t *reg_start = reg; uint8_t i; - regs->version = (adapter->hw.device_id << 16) | adapter->hw.subsystem_id; + /* the 1 (one) below indicates an attempt at versioning, if the + * interface in ethtool or the driver this 1 should be incremented */ + regs->version = (1<<24) | hw->revision_id << 16 | hw->device_id; /* General Registers */ *reg++ = IXGB_READ_REG(hw, CTRL0); /* 0 */