diff options
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch b/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch index f582cb43cd..774e8d0bfe 100644 --- a/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch +++ b/target/linux/layerscape/patches-5.4/701-net-0244-net-mscc-ocelot-separate-net_device-related-items-ou.patch @@ -518,7 +518,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> ppid->id_len = sizeof(ocelot->base_mac); memcpy(&ppid->id, &ocelot->base_mac, ppid->id_len); -@@ -1136,9 +1154,9 @@ static int ocelot_hwstamp_set(struct oce +@@ -1130,9 +1148,9 @@ static int ocelot_hwstamp_set(struct oce static int ocelot_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { @@ -531,7 +531,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> /* The function is only used for PTP operations for now */ if (!ocelot->ptp) -@@ -1175,8 +1193,8 @@ static const struct net_device_ops ocelo +@@ -1169,8 +1187,8 @@ static const struct net_device_ops ocelo static void ocelot_get_strings(struct net_device *netdev, u32 sset, u8 *data) { @@ -542,7 +542,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int i; if (sset != ETH_SS_STATS) -@@ -1230,8 +1248,9 @@ static void ocelot_check_stats_work(stru +@@ -1224,8 +1242,9 @@ static void ocelot_check_stats_work(stru static void ocelot_get_ethtool_stats(struct net_device *dev, struct ethtool_stats *stats, u64 *data) { @@ -554,7 +554,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int i; /* check and update now */ -@@ -1239,13 +1258,13 @@ static void ocelot_get_ethtool_stats(str +@@ -1233,13 +1252,13 @@ static void ocelot_get_ethtool_stats(str /* Copy all counters */ for (i = 0; i < ocelot->num_stats; i++) @@ -571,7 +571,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (sset != ETH_SS_STATS) return -EOPNOTSUPP; -@@ -1255,8 +1274,8 @@ static int ocelot_get_sset_count(struct +@@ -1249,8 +1268,8 @@ static int ocelot_get_sset_count(struct static int ocelot_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) { @@ -582,7 +582,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (!ocelot->ptp) return ethtool_op_get_ts_info(dev, info); -@@ -1388,9 +1407,9 @@ static int ocelot_port_attr_set(struct n +@@ -1385,9 +1404,9 @@ static int ocelot_port_attr_set(struct n const struct switchdev_attr *attr, struct switchdev_trans *trans) { @@ -595,7 +595,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> int err = 0; switch (attr->id) { -@@ -1402,8 +1421,8 @@ static int ocelot_port_attr_set(struct n +@@ -1399,8 +1418,8 @@ static int ocelot_port_attr_set(struct n ocelot_port_attr_ageing_set(ocelot, port, attr->u.ageing_time); break; case SWITCHDEV_ATTR_ID_BRIDGE_VLAN_FILTERING: @@ -606,7 +606,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> break; case SWITCHDEV_ATTR_ID_BRIDGE_MC_DISABLED: ocelot_port_attr_mc_set(ocelot, port, !attr->u.mc_disabled); -@@ -1468,15 +1487,17 @@ static int ocelot_port_obj_add_mdb(struc +@@ -1465,15 +1484,17 @@ static int ocelot_port_obj_add_mdb(struc const struct switchdev_obj_port_mdb *mdb, struct switchdev_trans *trans) { @@ -628,7 +628,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mc = ocelot_multicast_get(ocelot, mdb->addr, vid); if (!mc) { -@@ -1500,7 +1521,7 @@ static int ocelot_port_obj_add_mdb(struc +@@ -1497,7 +1518,7 @@ static int ocelot_port_obj_add_mdb(struc ocelot_mact_forget(ocelot, addr, vid); } @@ -637,7 +637,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> addr[2] = mc->ports << 0; addr[1] = mc->ports << 8; -@@ -1510,14 +1531,16 @@ static int ocelot_port_obj_add_mdb(struc +@@ -1507,14 +1528,16 @@ static int ocelot_port_obj_add_mdb(struc static int ocelot_port_obj_del_mdb(struct net_device *dev, const struct switchdev_obj_port_mdb *mdb) { @@ -658,7 +658,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mc = ocelot_multicast_get(ocelot, mdb->addr, vid); if (!mc) -@@ -1529,7 +1552,7 @@ static int ocelot_port_obj_del_mdb(struc +@@ -1526,7 +1549,7 @@ static int ocelot_port_obj_del_mdb(struc addr[0] = 0; ocelot_mact_forget(ocelot, addr, vid); @@ -667,7 +667,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> if (!mc->ports) { list_del(&mc->list); devm_kfree(ocelot->dev, mc); -@@ -1683,9 +1706,9 @@ static int ocelot_port_lag_join(struct o +@@ -1680,9 +1703,9 @@ static int ocelot_port_lag_join(struct o rcu_read_lock(); for_each_netdev_in_bond_rcu(bond, ndev) { @@ -679,7 +679,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } rcu_read_unlock(); -@@ -1753,20 +1776,23 @@ static int ocelot_netdevice_port_event(s +@@ -1750,20 +1773,23 @@ static int ocelot_netdevice_port_event(s unsigned long event, struct netdev_notifier_changeupper_info *info) { @@ -707,7 +707,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } if (netif_is_lag_master(info->upper_dev)) { if (info->linking) -@@ -2082,21 +2108,23 @@ int ocelot_probe_port(struct ocelot *oce +@@ -2079,21 +2105,23 @@ int ocelot_probe_port(struct ocelot *oce void __iomem *regs, struct phy_device *phy) { |