aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/amd/xgbe/xgbe.h
diff options
context:
space:
mode:
authorLendacky, Thomas <Thomas.Lendacky@amd.com>2015-05-14 11:44:27 -0500
committerDavid S. Miller <davem@davemloft.net>2015-05-15 15:21:43 -0400
commitc1ce2f77366bb7cde153596e9406fc7727d5726c (patch)
tree08bc7a1dd0956ecec94d447335d2eebc419ac980 /drivers/net/ethernet/amd/xgbe/xgbe.h
parentamd-xgbe: Support defining PHY resources in ETH device node (diff)
downloadlinux-dev-c1ce2f77366bb7cde153596e9406fc7727d5726c.tar.xz
linux-dev-c1ce2f77366bb7cde153596e9406fc7727d5726c.zip
amd-xgbe: Fix flow control setting logic
The flow control negotiation logic is flawed and does not properly advertise and process auto-negotiation of the flow control settings. Update the flow control support to properly set the flow control auto-negotiation settings and process the results approrpriately. Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/amd/xgbe/xgbe.h')
-rw-r--r--drivers/net/ethernet/amd/xgbe/xgbe.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h
index f535d19da803..63d72a140053 100644
--- a/drivers/net/ethernet/amd/xgbe/xgbe.h
+++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -539,10 +539,12 @@ struct xgbe_phy {
int autoneg;
int speed;
int duplex;
- int pause;
- int asym_pause;
int link;
+
+ int pause_autoneg;
+ int tx_pause;
+ int rx_pause;
};
struct xgbe_mmc_stats {
@@ -910,8 +912,6 @@ struct xgbe_prv_data {
phy_interface_t phy_mode;
int phy_link;
int phy_speed;
- unsigned int phy_tx_pause;
- unsigned int phy_rx_pause;
/* MDIO/PHY related settings */
struct xgbe_phy phy;