diff options
author | John Audia <therealgraysky@proton.me> | 2023-02-15 13:15:38 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-02-18 15:06:04 +0100 |
commit | 4536c76b558ca50645177a1e34bc24adda87d733 (patch) | |
tree | dd4a7dc2af3fa71d682c22c3ebf0e8a73509b5d9 /target/linux/generic/backport-5.15/705-11-v6.0-net-dsa-mt7530-rework-mt7530_hw_vlan_-add-del.patch | |
parent | 748f7f1b9c0ccb09840e954fbc405a3eb5187634 (diff) | |
download | upstream-4536c76b558ca50645177a1e34bc24adda87d733.tar.gz upstream-4536c76b558ca50645177a1e34bc24adda87d733.tar.bz2 upstream-4536c76b558ca50645177a1e34bc24adda87d733.zip |
kernel: bump 5.15 to 5.15.94
Patches automatically rebased.
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, 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 5fd109329c..2476cd361a 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 -@@ -1525,11 +1525,11 @@ static void +@@ -1537,11 +1537,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. -@@ -1540,22 +1540,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *p +@@ -1552,22 +1552,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 -@@ -1574,11 +1572,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p +@@ -1586,11 +1584,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *p return; } |