4.19-stable patches

added patches:
	net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch

diff --git a/queue-4.19/net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch b/queue-4.19/net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch
new file mode 100644 (file)
index 0000000..385f00c
--- /dev/null
+++ b/queue-4.19/net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch
@@ -0,0 +1,36 @@
+From ec2cbe4b8abf949a16574ba81d8255e52980186c Mon Sep 17 00:00:00 2001
+From: Roi Dayan <roid@mellanox.com>
+Date: Thu, 6 Aug 2020 19:05:42 -0700
+Subject: net/mlx5e: Don't support phys switch id if not in switchdev mode
+
+From: Roi Dayan <roid@mellanox.com>
+
+Support for phys switch id ndo added for representors and if
+we do not have representors there is no need to support it.
+Since each port return different switch id supporting this
+block support for creating bond over PFs and attaching to bridge
+in legacy mode.
+
+This bug doesn't exist upstream as the code got refactored and the
+netdev api is totally different.
+
+Fixes: cb67b832921c ("net/mlx5e: Introduce SRIOV VF representors")
+Signed-off-by: Roi Dayan <roid@mellanox.com>
+Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/net/ethernet/mellanox/mlx5/core/en_rep.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
++++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
+@@ -198,7 +198,7 @@ int mlx5e_attr_get(struct net_device *de
+       struct mlx5_eswitch_rep *rep = rpriv->rep;
+       struct mlx5_eswitch *esw = priv->mdev->priv.eswitch;
+ 
+-      if (esw->mode == SRIOV_NONE)
++      if (esw->mode != SRIOV_OFFLOADS)
+               return -EOPNOTSUPP;
+ 
+       switch (attr->id) {

diff --git a/queue-4.19/series b/queue-4.19/series
index 078de62707a465e6c589f2031ffa22581d4454fb..f41b4f1d08074e87653d84d0be9e09d3f92399a8 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -5,4 +5,5 @@ net-usb-dm9601-add-usb-id-of-keenetic-plus-dsl.patch
 sctp-not-disable-bh-in-the-whole-sctp_get_port_local.patch
 tipc-fix-shutdown-of-connectionless-socket.patch
 net-disable-netpoll-on-fresh-napis.patch
+net-mlx5e-don-t-support-phys-switch-id-if-not-in-switchdev-mode.patch
 bnxt-don-t-enable-napi-until-rings-are-ready.patch