aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2022-06-22 11:58:33 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2022-06-27 22:34:07 +0200
commitf2f03545d4d9f4df44300b95edfd340db1474501 (patch)
tree47c9aa7ac35b02f91510dee8872a00a7b6156a78 /target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
parent50db012243c107e69210341ba07ba6091e32106c (diff)
downloadupstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.gz
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.tar.bz2
upstream-f2f03545d4d9f4df44300b95edfd340db1474501.zip
kernel: bump 5.10 to 5.10.124
All patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 9e5d743422edc4036cda7d96b96ba62705f382de)
Diffstat (limited to 'target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch')
-rw-r--r--target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch b/target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
index 3d33ec0aeb..b0908cca9a 100644
--- a/target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
+++ b/target/linux/generic/backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch
@@ -48,7 +48,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
return buf_size;
}
-@@ -2609,6 +2609,35 @@ static void mtk_uninit(struct net_device
+@@ -2626,6 +2626,35 @@ static void mtk_uninit(struct net_device
mtk_rx_irq_disable(eth, ~0);
}
@@ -84,7 +84,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
{
struct mtk_mac *mac = netdev_priv(dev);
-@@ -2905,6 +2934,7 @@ static const struct net_device_ops mtk_n
+@@ -2922,6 +2951,7 @@ static const struct net_device_ops mtk_n
.ndo_set_mac_address = mtk_set_mac_address,
.ndo_validate_addr = eth_validate_addr,
.ndo_do_ioctl = mtk_do_ioctl,
@@ -92,7 +92,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org>
.ndo_tx_timeout = mtk_tx_timeout,
.ndo_get_stats64 = mtk_get_stats64,
.ndo_fix_features = mtk_fix_features,
-@@ -3007,7 +3037,10 @@ static int mtk_add_mac(struct mtk_eth *e
+@@ -3024,7 +3054,10 @@ static int mtk_add_mac(struct mtk_eth *e
eth->netdev[id]->irq = eth->irq[0];
eth->netdev[id]->dev.of_node = np;