---

yaml --- r: 369782 b: refs/heads/master c: c4a56de h: refs/heads/master v: v3
git-mirror · Apr 26, 2013 · 9be7c88 · 9be7c88
1 parent 3a107c9
commit 9be7c88
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46d5ceddd282262267abecd70c5ed6f5bdce0f92
+refs/heads/master: c4a56de88c6cd9996fb5dc7576d6c4934b5e6465
diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/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);