Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3203df04 authored by Greg Rose's avatar Greg Rose Committed by David S. Miller
Browse files

ixgbevf: Fix link speed display 



The ixgbevf driver would always report 10Gig speeds even when the link
speed is downshifted to 1Gig.  This patch fixes that problem.

Signed-off-by: default avatarGreg Rose <gregory.v.rose@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a9cbd588

drivers/net/ixgbevf/defines.h

+7 −5
Original line number Diff line number Diff line
@@ -45,7 +45,9 @@ typedef u32 ixgbe_link_speed; 
#define IXGBE_RXDCTL_ENABLE         0x02000000 /* Enable specific Rx Queue */

#define IXGBE_TXDCTL_ENABLE         0x02000000 /* Enable specific Tx Queue */

#define IXGBE_LINKS_UP              0x40000000

#define IXGBE_LINKS_SPEED       0x20000000

#define IXGBE_LINKS_SPEED_82599     0x30000000

#define IXGBE_LINKS_SPEED_10G_82599 0x30000000

#define IXGBE_LINKS_SPEED_1G_82599  0x20000000



/* Number of Transmit and Receive Descriptors must be a multiple of 8 */

#define IXGBE_REQ_TX_DESCRIPTOR_MULTIPLE  8

drivers/net/ixgbevf/vf.c

+2 −1
Original line number Diff line number Diff line
@@ -359,7 +359,8 @@ static s32 ixgbevf_check_mac_link_vf(struct ixgbe_hw *hw, 
	else

		*link_up = false;



	if (links_reg & IXGBE_LINKS_SPEED)

	if ((links_reg & IXGBE_LINKS_SPEED_82599) ==

	    IXGBE_LINKS_SPEED_10G_82599)

		*speed = IXGBE_LINK_SPEED_10GB_FULL;

	else

		*speed = IXGBE_LINK_SPEED_1GB_FULL;