diff options
| author | John Audia <graysky@archlinux.us> | 2021-09-04 19:54:35 -0400 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-09-13 17:08:17 +0200 |
| commit | 51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a (patch) | |
| tree | 3f9a794b168378c834694ac44047462738c8807d /target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch | |
| parent | 5fb4cb07e24655a45cc489d03f85ca813eb093a0 (diff) | |
| download | upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.gz upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.tar.bz2 upstream-51c7e1d25f6a4bc1f4906db508ab8a93a7bcaf4a.zip | |
kernel: bump 5.4 to 5.4.144
Manually rebased:
backport-5.4/370-netfilter-nf_flow_table-fix-offloaded-connection-tim.patch
All other patches automatically rebased.
Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch')
| -rw-r--r-- | target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch b/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch index 98d213ee6e..0804cea9f7 100644 --- a/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch +++ b/target/linux/generic/backport-5.4/753-v5.8-net-dsa-mt7530-fix-VLAN-setup.patch @@ -15,7 +15,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/dsa/mt7530.c +++ b/drivers/net/dsa/mt7530.c -@@ -1086,12 +1086,6 @@ mt7530_port_vlan_add(struct dsa_switch * +@@ -1083,12 +1083,6 @@ mt7530_port_vlan_add(struct dsa_switch * struct mt7530_priv *priv = ds->priv; u16 vid; @@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mutex_lock(&priv->reg_mutex); for (vid = vlan->vid_begin; vid <= vlan->vid_end; ++vid) { -@@ -1117,12 +1111,6 @@ mt7530_port_vlan_del(struct dsa_switch * +@@ -1114,12 +1108,6 @@ mt7530_port_vlan_del(struct dsa_switch * struct mt7530_priv *priv = ds->priv; u16 vid, pvid; @@ -41,7 +41,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mutex_lock(&priv->reg_mutex); pvid = priv->ports[port].pvid; -@@ -1235,6 +1223,7 @@ mt7530_setup(struct dsa_switch *ds) +@@ -1232,6 +1220,7 @@ mt7530_setup(struct dsa_switch *ds) * as two netdev instances. */ dn = ds->ports[MT7530_CPU_PORT].master->dev.of_node->parent; |