aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2021-06-22 00:45:18 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2021-06-22 23:23:00 +0200
commit2e17c710954bd3506467d700dee23757b138fedd (patch)
tree133318542771432b20759b94bf8389be64c25ab7 /target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch
parent2a3b2f59fec10d7c08f90f019b310db418e775bf (diff)
downloadupstream-2e17c710954bd3506467d700dee23757b138fedd.tar.gz
upstream-2e17c710954bd3506467d700dee23757b138fedd.tar.bz2
upstream-2e17c710954bd3506467d700dee23757b138fedd.zip
kernel: Backport patch to automatically bring up DSA master when opening user port
Without this patch we have to manually bring up the CPU interface in failsafe mode. This was backported from kernel 5.12. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> Tested-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch')
-rw-r--r--target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch b/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch
index 85c606c455..91aae5b65c 100644
--- a/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch
+++ b/target/linux/generic/pending-5.4/647-net-dsa-support-hardware-flow-table-offload.patch
@@ -38,7 +38,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
#include "dsa_priv.h"
-@@ -1223,6 +1227,27 @@ static struct devlink_port *dsa_slave_ge
+@@ -1226,6 +1230,27 @@ static struct devlink_port *dsa_slave_ge
return dp->ds->devlink ? &dp->devlink_port : NULL;
}
@@ -66,7 +66,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
static const struct net_device_ops dsa_slave_netdev_ops = {
.ndo_open = dsa_slave_open,
.ndo_stop = dsa_slave_close,
-@@ -1247,6 +1272,9 @@ static const struct net_device_ops dsa_s
+@@ -1250,6 +1275,9 @@ static const struct net_device_ops dsa_s
.ndo_vlan_rx_add_vid = dsa_slave_vlan_rx_add_vid,
.ndo_vlan_rx_kill_vid = dsa_slave_vlan_rx_kill_vid,
.ndo_get_devlink_port = dsa_slave_get_devlink_port,