diff options
author | John Audia <therealgraysky@proton.me> | 2023-03-30 11:39:17 -0400 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-04-01 19:58:44 +0200 |
commit | ec8c837eabec8fa0d6b013d3b766d1a0f4612ecb (patch) | |
tree | 7c72d7c8e88c82bc757f1552f29538c382b3600d /target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch | |
parent | 19752bdfa3e75da8290f525186e9fd8349df9c93 (diff) | |
download | upstream-ec8c837eabec8fa0d6b013d3b766d1a0f4612ecb.tar.gz upstream-ec8c837eabec8fa0d6b013d3b766d1a0f4612ecb.tar.bz2 upstream-ec8c837eabec8fa0d6b013d3b766d1a0f4612ecb.zip |
kernel: bump 5.15 to 5.15.105
Manually rebased:
Removed upstreamed:
backport-5.15/743-v6.3-0005-net-dsa-b53-mmap-fix-device-tree-support.patch[1]
backport-5.15/743-v6.3-0006-net-dsa-tag_brcm-legacy-fix-daisy-chained-switches.patch[2]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.105&id=9bbb3d3f218f1cf51f57a43cf8fd63b05be1b821
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.105&id=48f52431af9980582b6faa32ff8b581edb10486c
Build system: x86_64
Build-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, ramips/tplink_archer-a6-v3, filogic/xiaomi_redmi-router-ax6000-ubootmod
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch b/target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch index e33908c13d..26d207ca6a 100644 --- a/target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch +++ b/target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch @@ -26,7 +26,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1540,11 +1540,11 @@ static void +@@ -1536,11 +1536,11 @@ static void mt7530_hw_vlan_add(struct mt7530_priv *priv, struct mt7530_hw_vlan_entry *entry) { @@ -40,7 +40,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> /* Validate the entry with independent learning, create egress tag per * VLAN and joining the port as one of the port members. -@@ -1555,22 +1555,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *p +@@ -1551,22 +1551,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *p /* Decide whether adding tag or not for those outgoing packets from the * port inside the VLAN. @@ -72,7 +72,7 @@ Signed-off-by: Jakub Kicinski <kuba@kernel.org> } static void -@@ -1589,11 +1587,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p +@@ -1585,11 +1583,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p return; } |