kernel: bump 5.4 to 5.4.133
Manually rebased: pending-5.4/690-net-add-support-for-threaded-NAPI-polling.patch All other patches automatically rebased. Build system: x86_64 Build-tested: ipq806x/R7800 Run-tested: ipq806x/R7800 No dmesg regressions, everything functional Signed-off-by: John Audia <graysky@archlinux.us>
This commit is contained in:
committed by
Hauke Mehrtens
parent
2b2ac841e0
commit
5408e811b2
@@ -18,7 +18,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
--- a/drivers/of/of_net.c
|
||||
+++ b/drivers/of/of_net.c
|
||||
@@ -61,6 +61,7 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
@@ -55,6 +55,7 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
void *mac;
|
||||
u8 nvmem_mac[ETH_ALEN];
|
||||
struct platform_device *pdev = of_find_device_by_node(np);
|
||||
@@ -26,7 +26,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
|
||||
|
||||
if (!pdev) {
|
||||
*err = -ENODEV;
|
||||
@@ -78,10 +79,29 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
@@ -72,10 +73,29 @@ static void *of_get_mac_addr_nvmem(struc
|
||||
put_device(&pdev->dev);
|
||||
if (!mac) {
|
||||
*err = -ENOMEM;
|
||||
|
||||
@@ -14,11 +14,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
index ed4eacef17ce..666803817540 100644
|
||||
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
|
||||
@@ -3015,6 +3015,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
|
||||
@@ -3034,6 +3034,8 @@ static int mtk_add_mac(struct mtk_eth *e
|
||||
eth->netdev[id]->dev.of_node = np;
|
||||
|
||||
eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN;
|
||||
@@ -27,6 +25,3 @@ index ed4eacef17ce..666803817540 100644
|
||||
|
||||
return 0;
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
@@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
|
||||
net/dsa/dsa2.c | 2 +
|
||||
1 file changed, 2 insertion(+)
|
||||
|
||||
diff --git a/net/dsa/dsa2.c b/net/dsa/dsa2.c
|
||||
index b71e87909f0e..55bbc1a769ca 100644
|
||||
--- a/net/dsa/dsa2.c
|
||||
+++ b/net/dsa/dsa2.c
|
||||
@@ -14,6 +14,7 @@
|
||||
@@ -27,7 +25,7 @@ index b71e87909f0e..55bbc1a769ca 100644
|
||||
#include <net/devlink.h>
|
||||
|
||||
#include "dsa_priv.h"
|
||||
@@ -392,6 +392,7 @@ static int dsa_port_setup(struct dsa_port *dp)
|
||||
@@ -318,6 +319,7 @@ static int dsa_port_setup(struct dsa_por
|
||||
break;
|
||||
devlink_port_registered = true;
|
||||
|
||||
@@ -35,6 +33,3 @@ index b71e87909f0e..55bbc1a769ca 100644
|
||||
dp->mac = of_get_mac_address(dp->dn);
|
||||
err = dsa_slave_create(dp);
|
||||
if (err)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user