diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:56:53 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2018-08-24 14:56:53 -0400 |
| commit | 24346f1620d4983ab97aefbb718922033b3805ca (patch) | |
| tree | 97341ecb2e53c4337f9fd57d548ab8f057074f05 | |
| parent | 907c462cad21e59b28fd8af02e85300a8d3a85c7 (diff) | |
| download | longterm-queue-4.12-24346f1620d4983ab97aefbb718922033b3805ca.tar.gz | |
mellanox: refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch b/queue/mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch index 9d587eb..cd1fd58 100644 --- a/queue/mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch +++ b/queue/mlxsw-spectrum-Disable-MAC-learning-for-ovs-port.patch @@ -1,4 +1,4 @@ -From fccff0862838908d21eaf956d57e09c6c189f7c5 Mon Sep 17 00:00:00 2001 +From f9cdf373d7bc4f784d2bfebbd7a6a26182d1eec4 Mon Sep 17 00:00:00 2001 From: Yuval Mintz <yuvalm@mellanox.com> Date: Fri, 15 Dec 2017 08:44:21 +0100 Subject: [PATCH] mlxsw: spectrum: Disable MAC learning for ovs port @@ -15,20 +15,21 @@ Signed-off-by: Yuval Mintz <yuvalm@mellanox.com> Reviewed-by: Ido Schimmel <idosch@mellanox.com> Signed-off-by: Jiri Pirko <jiri@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c -index 2d0897b7d860..9bd8d28de152 100644 +index e2cc45ef1453..49aac92e71e3 100644 --- a/drivers/net/ethernet/mellanox/mlxsw/spectrum.c +++ b/drivers/net/ethernet/mellanox/mlxsw/spectrum.c -@@ -4300,6 +4300,7 @@ static int mlxsw_sp_port_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, +@@ -4063,6 +4063,7 @@ static int mlxsw_sp_port_stp_set(struct mlxsw_sp_port *mlxsw_sp_port, static int mlxsw_sp_port_ovs_join(struct mlxsw_sp_port *mlxsw_sp_port) { + u16 vid = 1; int err; - err = mlxsw_sp_port_vp_mode_set(mlxsw_sp_port, true); -@@ -4312,8 +4313,19 @@ static int mlxsw_sp_port_ovs_join(struct mlxsw_sp_port *mlxsw_sp_port) + err = mlxsw_sp_port_stp_set(mlxsw_sp_port, true); +@@ -4072,8 +4073,19 @@ static int mlxsw_sp_port_ovs_join(struct mlxsw_sp_port *mlxsw_sp_port) true, false); if (err) goto err_port_vlan_set; @@ -47,8 +48,8 @@ index 2d0897b7d860..9bd8d28de152 100644 + mlxsw_sp_port_vid_learning_set(mlxsw_sp_port, vid, true); err_port_vlan_set: mlxsw_sp_port_stp_set(mlxsw_sp_port, false); - err_port_stp_set: -@@ -4323,6 +4335,12 @@ err_port_stp_set: + return err; +@@ -4081,6 +4093,12 @@ static int mlxsw_sp_port_ovs_join(struct mlxsw_sp_port *mlxsw_sp_port) static void mlxsw_sp_port_ovs_leave(struct mlxsw_sp_port *mlxsw_sp_port) { |