Commit 5b502a7b authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: dsa: propagate resolved link config via mac_link_up() 



Propagate the resolved link configuration down via DSA's
phylink_mac_link_up() operation to allow split PCS/MAC to work.

Tested-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 91a208f2

drivers/net/dsa/b53/b53_common.c

+3 −1
Original line number Diff line number Diff line
@@ -1289,7 +1289,9 @@ EXPORT_SYMBOL(b53_phylink_mac_link_down); 
void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,

			     unsigned int mode,

			     phy_interface_t interface,

			     struct phy_device *phydev)

			     struct phy_device *phydev,

			     int speed, int duplex,

			     bool tx_pause, bool rx_pause)

{

	struct b53_device *dev = ds->priv;

drivers/net/dsa/b53/b53_priv.h

+3 −1
Original line number Diff line number Diff line
@@ -338,7 +338,9 @@ void b53_phylink_mac_link_down(struct dsa_switch *ds, int port, 
void b53_phylink_mac_link_up(struct dsa_switch *ds, int port,

			     unsigned int mode,

			     phy_interface_t interface,

			     struct phy_device *phydev);

			     struct phy_device *phydev,

			     int speed, int duplex,

			     bool tx_pause, bool rx_pause);

int b53_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering);

int b53_vlan_prepare(struct dsa_switch *ds, int port,

		     const struct switchdev_obj_port_vlan *vlan);

drivers/net/dsa/bcm_sf2.c

+3 −1
Original line number Diff line number Diff line
@@ -649,7 +649,9 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port, 
static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,

				   unsigned int mode,

				   phy_interface_t interface,

				   struct phy_device *phydev)

				   struct phy_device *phydev,

				   int speed, int duplex,

				   bool tx_pause, bool rx_pause)

{

	struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);

	struct ethtool_eee *p = &priv->dev->ports[port].eee;

drivers/net/dsa/lantiq_gswip.c

+3 −1
Original line number Diff line number Diff line
@@ -1517,7 +1517,9 @@ static void gswip_phylink_mac_link_down(struct dsa_switch *ds, int port, 
static void gswip_phylink_mac_link_up(struct dsa_switch *ds, int port,

				      unsigned int mode,

				      phy_interface_t interface,

				      struct phy_device *phydev)

				      struct phy_device *phydev,

				      int speed, int duplex,

				      bool tx_pause, bool rx_pause)

{

	struct gswip_priv *priv = ds->priv;

drivers/net/dsa/mt7530.c

+3 −1
Original line number Diff line number Diff line
@@ -1482,7 +1482,9 @@ static void mt7530_phylink_mac_link_down(struct dsa_switch *ds, int port, 
static void mt7530_phylink_mac_link_up(struct dsa_switch *ds, int port,

				       unsigned int mode,

				       phy_interface_t interface,

				       struct phy_device *phydev)

				       struct phy_device *phydev,

				       int speed, int duplex,

				       bool tx_pause, bool rx_pause)

{

	struct mt7530_priv *priv = ds->priv;

CRA Git | Maintained and supported by SUSTech CRA and CCSE