From db20eabffc602ce86edbf787ef1226e24b20ea97 Mon Sep 17 00:00:00 2001 From: Emil Tantilov Date: Thu, 15 Sep 2011 06:23:10 +0000 Subject: [PATCH] --- yaml --- r: 266427 b: refs/heads/master c: 217995ecd04999284ba4c5745e789314ea99e54f h: refs/heads/master i: 266425: a007d4111571ffdecf69eb5aab05f0f53bfc5cca 266423: 509f2728eba05efe8cbfdcc2b12a71eada6c89b5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ff81c71cdcc9..197500484448 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7d145282da8d1ae4ba5f7ead8a4f51183496803c +refs/heads/master: 217995ecd04999284ba4c5745e789314ea99e54f diff --git a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c index ae9fba5d3036..db255fc37863 100644 --- a/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c +++ b/trunk/drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c @@ -460,7 +460,7 @@ static void ixgbe_set_msglevel(struct net_device *netdev, u32 data) static int ixgbe_get_regs_len(struct net_device *netdev) { -#define IXGBE_REGS_LEN 1128 +#define IXGBE_REGS_LEN 1129 return IXGBE_REGS_LEN * sizeof(u32); } @@ -771,6 +771,9 @@ static void ixgbe_get_regs(struct net_device *netdev, regs_buff[1125] = IXGBE_READ_REG(hw, IXGBE_PCIEECCCTL); regs_buff[1126] = IXGBE_READ_REG(hw, IXGBE_PBTXECC); regs_buff[1127] = IXGBE_READ_REG(hw, IXGBE_PBRXECC); + + /* 82599 X540 specific registers */ + regs_buff[1128] = IXGBE_READ_REG(hw, IXGBE_MFLCN); } static int ixgbe_get_eeprom_len(struct net_device *netdev)