diff options
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch b/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch index 5cf09039df..dc5847c528 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0242-net-mscc-ocelot-change-prototypes-of-switchdev-port-.patch @@ -19,7 +19,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/mscc/ocelot.c +++ b/drivers/net/ethernet/mscc/ocelot.c -@@ -1285,26 +1285,20 @@ static const struct ethtool_ops ocelot_e +@@ -1282,26 +1282,20 @@ static const struct ethtool_ops ocelot_e .get_ts_info = ocelot_get_ts_info, }; @@ -53,7 +53,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* Fallthrough */ case BR_STATE_LEARNING: port_cfg |= ANA_PORT_PORT_CFG_LEARN_ENA; -@@ -1312,19 +1306,18 @@ static int ocelot_port_attr_stp_state_se +@@ -1309,19 +1303,18 @@ static int ocelot_port_attr_stp_state_se default: port_cfg &= ~ANA_PORT_PORT_CFG_LEARN_ENA; @@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> for (i = 0; i < ocelot->num_phys_ports; i++) { unsigned long bond_mask = ocelot->lags[i]; -@@ -1332,7 +1325,7 @@ static int ocelot_port_attr_stp_state_se +@@ -1329,7 +1322,7 @@ static int ocelot_port_attr_stp_state_se if (!bond_mask) continue; @@ -87,7 +87,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mask &= ~bond_mask; break; } -@@ -1340,47 +1333,55 @@ static int ocelot_port_attr_stp_state_se +@@ -1337,47 +1330,55 @@ static int ocelot_port_attr_stp_state_se ocelot_write_rix(ocelot, BIT(ocelot->num_phys_ports) | mask, @@ -162,7 +162,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } static int ocelot_port_attr_set(struct net_device *dev, -@@ -1389,22 +1390,23 @@ static int ocelot_port_attr_set(struct n +@@ -1386,22 +1387,23 @@ static int ocelot_port_attr_set(struct n { struct ocelot_port *ocelot_port = netdev_priv(dev); struct ocelot *ocelot = ocelot_port->ocelot; |