aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch
diff options
context:
space:
mode:
authorJohn Audia <therealgraysky@proton.me>2023-03-18 15:05:11 -0400
committerHauke Mehrtens <hauke@hauke-m.de>2023-03-27 18:59:50 +0200
commita4212b77c0a48904218093645008f176e65e79bb (patch)
treeefcb3d5e26890e573396af9112a9b0dcadabf190 /target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch
parent6b19d24254a1fe38e003a8dbf08d9d10099a56d1 (diff)
downloadupstream-a4212b77c0a48904218093645008f176e65e79bb.tar.gz
upstream-a4212b77c0a48904218093645008f176e65e79bb.tar.bz2
upstream-a4212b77c0a48904218093645008f176e65e79bb.zip
kernel: bump 5.10 to 5.10.175
Manually rebased: backport-5.10/611-v5.12-net-ethernet-mediatek-support-setting-MTU.patch All other patches automatically rebased. Signed-off-by: John Audia <therealgraysky@proton.me> (cherry picked from commit 3ca98495897126113912f7ee4537f69459d21332)
Diffstat (limited to 'target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch')
-rw-r--r--target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch
index bc377bdd82..fcd9678d05 100644
--- a/target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch
+++ b/target/linux/generic/hack-5.10/773-bgmac-add-srab-switch.patch
@@ -50,9 +50,9 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
/**************************************************
* MII
**************************************************/
-@@ -1542,6 +1554,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
- /* Omit FCS from max MTU size */
- net_dev->max_mtu = BGMAC_RX_MAX_FRAME_SIZE - ETH_FCS_LEN;
+@@ -1546,6 +1558,14 @@ int bgmac_enet_probe(struct bgmac *bgmac
+
+ bgmac->in_init = false;
+ if ((bgmac->feature_flags & BGMAC_FEAT_SRAB) && !bgmac_b53_pdata.regs) {
+ bgmac_b53_pdata.regs = ioremap(0x18007000, 0x1000);
@@ -65,7 +65,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
err = register_netdev(bgmac->net_dev);
if (err) {
dev_err(bgmac->dev, "Cannot register net device\n");
-@@ -1564,6 +1584,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
+@@ -1568,6 +1588,10 @@ EXPORT_SYMBOL_GPL(bgmac_enet_probe);
void bgmac_enet_remove(struct bgmac *bgmac)
{
@@ -86,7 +86,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
struct bgmac_slot_info {
union {
-@@ -533,6 +534,9 @@ struct bgmac {
+@@ -535,6 +536,9 @@ struct bgmac {
void (*cmn_maskset32)(struct bgmac *bgmac, u16 offset, u32 mask,
u32 set);
int (*phy_connect)(struct bgmac *bgmac);