fix up 5.15 build issue

diff --git a/queue-5.15/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch b/queue-5.15/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch
index 8fd3b434e4dd1d211de7c04fb300aa70d98f6027..55d78e72e4c7eb33eeb60df28f77814f175e5060 100644 (file)
--- a/queue-5.15/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch
+++ b/queue-5.15/net-dsa-mt7530-fix-handling-of-802.1x-pae-frames.patch
@@ -22,15 +22,13 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Stable-dep-of: e8bf353577f3 ("net: dsa: mt7530: fix link-local frames that ingress vlan filtering ports")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/dsa/mt7530.c | 4 ++++
- drivers/net/dsa/mt7530.h | 2 ++
+ drivers/net/dsa/mt7530.c |    4 ++++
+ drivers/net/dsa/mt7530.h |    2 ++
  2 files changed, 6 insertions(+)
 
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 252e8eaa92767..30570b9dc88f2 100644
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -1000,6 +1000,10 @@ mt753x_trap_frames(struct mt7530_priv *priv)
+@@ -1001,6 +1001,10 @@ mt753x_trap_frames(struct mt7530_priv *p
        mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
                   MT753X_BPDU_CPU_ONLY);
  
@@ -41,8 +39,6 @@ index 252e8eaa92767..30570b9dc88f2 100644
        /* Trap LLDP frames with :0E MAC DA to the CPU port(s) */
        mt7530_rmw(priv, MT753X_RGAC2, MT753X_R0E_PORT_FW_MASK,
                   MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY));
-diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
-index 8cee462d5f1cb..2c895f35383e2 100644
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
 @@ -65,6 +65,8 @@ enum mt753x_id {
@@ -54,6 +50,3 @@ index 8cee462d5f1cb..2c895f35383e2 100644
  
  /* Register for :03 and :0E MAC DA frame control */
  #define MT753X_RGAC2                  0x2c
--- 
-2.43.0
-

diff --git a/queue-5.15/net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch b/queue-5.15/net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch
index b0d5a2b470d458aecdf5373dab96f397deb3c475..1379acdf754d21a6c5388cf8be22c27330a6b61d 100644 (file)
--- a/queue-5.15/net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch
+++ b/queue-5.15/net-dsa-mt7530-fix-handling-of-all-link-local-frames.patch
@@ -45,15 +45,13 @@ Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/dsa/mt7530.c | 37 +++++++++++++++++++++++++++++++++----
- drivers/net/dsa/mt7530.h | 13 +++++++++++++
+ drivers/net/dsa/mt7530.c |   37 +++++++++++++++++++++++++++++++++----
+ drivers/net/dsa/mt7530.h |   13 +++++++++++++
  2 files changed, 46 insertions(+), 4 deletions(-)
 
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 834bcb9d44fd7..f36aacebb1bc6 100644
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -993,6 +993,21 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
+@@ -994,6 +994,21 @@ unlock_exit:
        mutex_unlock(&priv->reg_mutex);
  }
  
@@ -75,7 +73,7 @@ index 834bcb9d44fd7..f36aacebb1bc6 100644
  static void
  mt753x_trap_frames(struct mt7530_priv *priv)
  {
-@@ -1007,13 +1022,27 @@ mt753x_trap_frames(struct mt7530_priv *priv)
+@@ -1008,13 +1023,27 @@ mt753x_trap_frames(struct mt7530_priv *p
                   MT753X_BPDU_EG_TAG(MT7530_VLAN_EG_UNTAGGED) |
                   MT753X_BPDU_CPU_ONLY);
  
@@ -107,8 +105,6 @@ index 834bcb9d44fd7..f36aacebb1bc6 100644
  }
  
  static int
-diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
-index 7c0820d341db7..03598f9ae288c 100644
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
 @@ -72,12 +72,25 @@ enum mt753x_id {
@@ -137,6 +133,3 @@ index 7c0820d341db7..03598f9ae288c 100644
  
  enum mt753x_bpdu_port_fw {
        MT753X_BPDU_FOLLOW_MFC,
--- 
-2.43.0
-

diff --git a/queue-5.15/net-dsa-mt7530-fix-handling-of-lldp-frames.patch b/queue-5.15/net-dsa-mt7530-fix-handling-of-lldp-frames.patch
index 532ffd4e53456c90b09d5d7852a65caf48a330c7..71fe154309ca7d079f8dec95e304031e95464979 100644 (file)
--- a/queue-5.15/net-dsa-mt7530-fix-handling-of-lldp-frames.patch
+++ b/queue-5.15/net-dsa-mt7530-fix-handling-of-lldp-frames.patch
@@ -24,15 +24,21 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 Stable-dep-of: e8bf353577f3 ("net: dsa: mt7530: fix link-local frames that ingress vlan filtering ports")
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/dsa/mt7530.c | 4 ++++
- drivers/net/dsa/mt7530.h | 5 +++++
- 2 files changed, 9 insertions(+)
+ drivers/net/dsa/mt7530.c |    5 +++++
+ drivers/net/dsa/mt7530.h |    5 +++++
+ 2 files changed, 10 insertions(+)
 
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 636943035c292..252e8eaa92767 100644
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -999,6 +999,10 @@ mt753x_trap_frames(struct mt7530_priv *priv)
+@@ -18,6 +18,7 @@
+ #include <linux/regmap.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/reset.h>
++#include <linux/bitfield.h>
+ #include <linux/gpio/consumer.h>
+ #include <linux/gpio/driver.h>
+ #include <net/dsa.h>
+@@ -999,6 +1000,10 @@ mt753x_trap_frames(struct mt7530_priv *p
        /* Trap BPDUs to the CPU port(s) */
        mt7530_rmw(priv, MT753X_BPC, MT753X_BPDU_PORT_FW_MASK,
                   MT753X_BPDU_CPU_ONLY);
@@ -43,8 +49,6 @@ index 636943035c292..252e8eaa92767 100644
  }
  
  static int
-diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
-index 91508e2feef95..8cee462d5f1cb 100644
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
 @@ -66,6 +66,11 @@ enum mt753x_id {
@@ -59,6 +63,3 @@ index 91508e2feef95..8cee462d5f1cb 100644
  enum mt753x_bpdu_port_fw {
        MT753X_BPDU_FOLLOW_MFC,
        MT753X_BPDU_CPU_EXCLUDE = 4,
--- 
-2.43.0
-

diff --git a/queue-5.15/net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch b/queue-5.15/net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch
index 5c3b984661a57e15e351acd922566700cde71cc7..34ab54c2032787b40ece8e31064e7716e037e5e7 100644 (file)
--- a/queue-5.15/net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch
+++ b/queue-5.15/net-dsa-mt7530-fix-link-local-frames-that-ingress-vl.patch
@@ -105,15 +105,13 @@ Signed-off-by: Arınç ÜNAL <arinc.unal@arinc9.com>
 Signed-off-by: Paolo Abeni <pabeni@redhat.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- drivers/net/dsa/mt7530.c | 23 +++++++++++++++--------
- drivers/net/dsa/mt7530.h |  9 ++++++++-
+ drivers/net/dsa/mt7530.c |   23 +++++++++++++++--------
+ drivers/net/dsa/mt7530.h |    9 ++++++++-
  2 files changed, 23 insertions(+), 9 deletions(-)
 
-diff --git a/drivers/net/dsa/mt7530.c b/drivers/net/dsa/mt7530.c
-index 30570b9dc88f2..834bcb9d44fd7 100644
 --- a/drivers/net/dsa/mt7530.c
 +++ b/drivers/net/dsa/mt7530.c
-@@ -996,16 +996,23 @@ static void mt7530_setup_port5(struct dsa_switch *ds, phy_interface_t interface)
+@@ -997,16 +997,23 @@ unlock_exit:
  static void
  mt753x_trap_frames(struct mt7530_priv *priv)
  {
@@ -145,8 +143,6 @@ index 30570b9dc88f2..834bcb9d44fd7 100644
                   MT753X_R0E_PORT_FW(MT753X_BPDU_CPU_ONLY));
  }
  
-diff --git a/drivers/net/dsa/mt7530.h b/drivers/net/dsa/mt7530.h
-index 2c895f35383e2..7c0820d341db7 100644
 --- a/drivers/net/dsa/mt7530.h
 +++ b/drivers/net/dsa/mt7530.h
 @@ -64,12 +64,18 @@ enum mt753x_id {
@@ -177,6 +173,3 @@ index 2c895f35383e2..7c0820d341db7 100644
  };
  
  enum mt7530_vlan_port_attr {
--- 
-2.43.0
-