Skip to content

Commit

Permalink
stmmac: fix advertising 1000Base capabilties for non GMII iface
Browse files Browse the repository at this point in the history
This patch fixes the way to stop the 1000Base advertising
capabilties for non GMII interfaces.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@st.com>
Acked-by: Giuseppe Cavallaro <peppe.cavallaro@st.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Srinivas Kandagatla authored and David S. Miller committed Nov 17, 2011
1 parent bbc1754 commit c5b9b4e
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -321,12 +321,10 @@ static int stmmac_init_phy(struct net_device *dev)
}

/* Stop Advertising 1000BASE Capability if interface is not GMII */
if ((interface) && ((interface == PHY_INTERFACE_MODE_MII) ||
(interface == PHY_INTERFACE_MODE_RMII))) {
phydev->supported &= (PHY_BASIC_FEATURES | SUPPORTED_Pause |
SUPPORTED_Asym_Pause);
phydev->advertising = phydev->supported;
}
if ((interface == PHY_INTERFACE_MODE_MII) ||
(interface == PHY_INTERFACE_MODE_RMII))
phydev->advertising &= ~(SUPPORTED_1000baseT_Half |
SUPPORTED_1000baseT_Full);

/*
* Broken HW is sometimes missing the pull-up resistor on the
Expand Down

0 comments on commit c5b9b4e

Please sign in to comment.