diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /drivers/net/ixgb/ixgb_ethtool.c | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/ixgb/ixgb_ethtool.c')
| -rw-r--r-- | drivers/net/ixgb/ixgb_ethtool.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ixgb/ixgb_ethtool.c b/drivers/net/ixgb/ixgb_ethtool.c index aea10e8aaa72..3fa113854eeb 100644 --- a/drivers/net/ixgb/ixgb_ethtool.c +++ b/drivers/net/ixgb/ixgb_ethtool.c | |||
| @@ -252,7 +252,9 @@ ixgb_get_regs(struct net_device *netdev, | |||
| 252 | uint32_t *reg_start = reg; | 252 | uint32_t *reg_start = reg; |
| 253 | uint8_t i; | 253 | uint8_t i; |
| 254 | 254 | ||
| 255 | regs->version = (adapter->hw.device_id << 16) | adapter->hw.subsystem_id; | 255 | /* the 1 (one) below indicates an attempt at versioning, if the |
| 256 | * interface in ethtool or the driver this 1 should be incremented */ | ||
| 257 | regs->version = (1<<24) | hw->revision_id << 16 | hw->device_id; | ||
| 256 | 258 | ||
| 257 | /* General Registers */ | 259 | /* General Registers */ |
| 258 | *reg++ = IXGB_READ_REG(hw, CTRL0); /* 0 */ | 260 | *reg++ = IXGB_READ_REG(hw, CTRL0); /* 0 */ |