aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2022-11-13 00:44:25 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2022-11-13 01:06:12 +0100
commit079ce0413a1e3c19dd00be1b90de737c2bc09223 (patch)
tree2b8a95a2775fc260023e5637b70642ac7ba277ce /target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
parentdec6584b22bad48fb0f21904bc552697360005b0 (diff)
downloadupstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.tar.gz
upstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.tar.bz2
upstream-079ce0413a1e3c19dd00be1b90de737c2bc09223.zip
kernel: bump 5.4 to 5.4.224
Manually adapted: generic/pending-5.4/680-NET-skip-GRO-for-foreign-MAC-addresses.patch lantiq/patches-5.4/0028-NET-lantiq-various-etop-fixes.patch Compile-tested: x86/64 Run-tested: x86/64 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch')
-rw-r--r--target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch b/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
index e516e1d5b6..c67db6ad3d 100644
--- a/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
+++ b/target/linux/layerscape/patches-5.4/701-net-0225-enetc-Configure-the-Time-Aware-Scheduler-via-tc-tapr.patch
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
fsl-enetc-mdio-y := enetc_pci_mdio.o enetc_mdio.o
--- a/drivers/net/ethernet/freescale/enetc/enetc.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc.c
-@@ -1419,8 +1419,7 @@ int enetc_close(struct net_device *ndev)
+@@ -1424,8 +1424,7 @@ int enetc_close(struct net_device *ndev)
return 0;
}
@@ -67,7 +67,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
{
struct enetc_ndev_priv *priv = netdev_priv(ndev);
struct tc_mqprio_qopt *mqprio = type_data;
-@@ -1428,9 +1427,6 @@ int enetc_setup_tc(struct net_device *nd
+@@ -1433,9 +1432,6 @@ int enetc_setup_tc(struct net_device *nd
u8 num_tc;
int i;
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mqprio->hw = TC_MQPRIO_HW_OFFLOAD_TCS;
num_tc = mqprio->num_tc;
-@@ -1475,6 +1471,19 @@ int enetc_setup_tc(struct net_device *nd
+@@ -1480,6 +1476,19 @@ int enetc_setup_tc(struct net_device *nd
return 0;
}