diff options
Diffstat (limited to 'drivers/net/dsa/lan9303-core.c')
| -rw-r--r-- | drivers/net/dsa/lan9303-core.c | 7 | 
1 files changed, 4 insertions, 3 deletions
| diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index 89f920289ae2..d55784d19fa4 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c @@ -1103,12 +1103,13 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port)  }  static int lan9303_port_bridge_join(struct dsa_switch *ds, int port, -				    struct net_device *br) +				    struct dsa_bridge bridge, +				    bool *tx_fwd_offload)  {  	struct lan9303 *chip = ds->priv;  	dev_dbg(chip->dev, "%s(port %d)\n", __func__, port); -	if (dsa_to_port(ds, 1)->bridge_dev == dsa_to_port(ds, 2)->bridge_dev) { +	if (dsa_port_bridge_same(dsa_to_port(ds, 1), dsa_to_port(ds, 2))) {  		lan9303_bridge_ports(chip);  		chip->is_bridged = true;  /* unleash stp_state_set() */  	} @@ -1117,7 +1118,7 @@ static int lan9303_port_bridge_join(struct dsa_switch *ds, int port,  }  static void lan9303_port_bridge_leave(struct dsa_switch *ds, int port, -				      struct net_device *br) +				      struct dsa_bridge bridge)  {  	struct lan9303 *chip = ds->priv; |