diff options
| author | John Audia <graysky@archlinux.us> | 2022-02-06 11:51:17 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-02-11 23:17:40 +0100 |
| commit | e9c1c83679891a02e3b95b954847a95621cbbc79 (patch) | |
| tree | bdb58f19b89da010f5ec9f8949f740025bf74cd0 /target/linux/ramips | |
| parent | 337e942290fa6a18e0289ae32420c5c402aead1a (diff) | |
| download | upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.gz upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.tar.bz2 upstream-e9c1c83679891a02e3b95b954847a95621cbbc79.zip | |
kernel: bump 5.10 to 5.10.98
Manually rebased:
bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/ramips')
| -rw-r--r-- | target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch index 531a23ef4a..9a4971d117 100644 --- a/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch +++ b/target/linux/ramips/patches-5.10/700-net-ethernet-mediatek-support-net-labels.patch @@ -14,7 +14,7 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c -@@ -2911,6 +2911,7 @@ static const struct net_device_ops mtk_n +@@ -2941,6 +2941,7 @@ static const struct net_device_ops mtk_n static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) { @@ -22,9 +22,9 @@ Signed-off-by: René van Dorst <opensource@vdorst.com> const __be32 *_id = of_get_property(np, "reg", NULL); phy_interface_t phy_mode; struct phylink *phylink; -@@ -3003,6 +3004,9 @@ static int mtk_add_mac(struct mtk_eth *e - - eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH - MTK_RX_ETH_HLEN; +@@ -3036,6 +3037,9 @@ static int mtk_add_mac(struct mtk_eth *e + else + eth->netdev[id]->max_mtu = MTK_MAX_RX_LENGTH_2K - MTK_RX_ETH_HLEN; + if (name) + strlcpy(eth->netdev[id]->name, name, IFNAMSIZ); |