mirror of
git://git.openwrt.org/openwrt/openwrt.git
synced 2025-01-03 04:42:23 +00:00
generic: 5.15: qca8k: add kernel version tag on backport patch
Add kernel tag that introduced the patch on backport patch. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
This commit is contained in:
parent
7152599407
commit
ddcebda08b
@ -22,7 +22,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/net/dsa/slave.c
|
||||
+++ b/net/dsa/slave.c
|
||||
@@ -1977,13 +1977,6 @@ int dsa_slave_create(struct dsa_port *po
|
||||
@@ -1986,13 +1986,6 @@ int dsa_slave_create(struct dsa_port *po
|
||||
port->slave = slave_dev;
|
||||
dsa_slave_setup_tagger(slave_dev);
|
||||
|
||||
@ -36,7 +36,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
netif_carrier_off(slave_dev);
|
||||
|
||||
ret = dsa_slave_phy_setup(slave_dev);
|
||||
@@ -1995,6 +1988,13 @@ int dsa_slave_create(struct dsa_port *po
|
||||
@@ -2004,6 +1997,13 @@ int dsa_slave_create(struct dsa_port *po
|
||||
}
|
||||
|
||||
rtnl_lock();
|
@ -16,7 +16,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/net/dsa/slave.c
|
||||
+++ b/net/dsa/slave.c
|
||||
@@ -1988,14 +1988,12 @@ int dsa_slave_create(struct dsa_port *po
|
||||
@@ -1997,14 +1997,12 @@ int dsa_slave_create(struct dsa_port *po
|
||||
}
|
||||
|
||||
rtnl_lock();
|
@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
static inline bool dsa_is_unused_port(struct dsa_switch *ds, int p)
|
||||
{
|
||||
return dsa_to_port(ds, p)->type == DSA_PORT_TYPE_UNUSED;
|
||||
@@ -949,6 +959,13 @@ struct dsa_switch_ops {
|
||||
@@ -916,6 +926,13 @@ struct dsa_switch_ops {
|
||||
int (*tag_8021q_vlan_add)(struct dsa_switch *ds, int port, u16 vid,
|
||||
u16 flags);
|
||||
int (*tag_8021q_vlan_del)(struct dsa_switch *ds, int port, u16 vid);
|
||||
@ -175,7 +175,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
|
||||
--- a/net/dsa/slave.c
|
||||
+++ b/net/dsa/slave.c
|
||||
@@ -2311,6 +2311,36 @@ static int dsa_slave_netdevice_event(str
|
||||
@@ -2320,6 +2320,36 @@ static int dsa_slave_netdevice_event(str
|
||||
err = dsa_port_lag_change(dp, info->lower_state_info);
|
||||
return notifier_from_errno(err);
|
||||
}
|
||||
@ -212,7 +212,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
case NETDEV_GOING_DOWN: {
|
||||
struct dsa_port *dp, *cpu_dp;
|
||||
struct dsa_switch_tree *dst;
|
||||
@@ -2322,6 +2352,8 @@ static int dsa_slave_netdevice_event(str
|
||||
@@ -2331,6 +2361,8 @@ static int dsa_slave_netdevice_event(str
|
||||
cpu_dp = dev->dsa_ptr;
|
||||
dst = cpu_dp->ds->dst;
|
||||
|
Loading…
Reference in New Issue
Block a user