Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 598f2e2b authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx4' 



Or Gerlitz says:

====================
mlx4 fixes

These short series fixes two bugs related to the vxlan support and a
missing req module call for the IB driver which is needed to support
IB/RDMA over Ethernet.

Pathes done over the net tree, commit dd38743b "vlan: Set correct
source MAC address with TX VLAN offload enabled"
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 836fbaf4 7855bff4

drivers/net/ethernet/mellanox/mlx4/en_netdev.c

+8 −0
Original line number Diff line number Diff line
@@ -742,6 +742,14 @@ static int mlx4_en_replace_mac(struct mlx4_en_priv *priv, int qpn, 
				err = mlx4_en_uc_steer_add(priv, new_mac,

							   &qpn,

							   &entry->reg_id);

				if (err)

					return err;

				if (priv->tunnel_reg_id) {

					mlx4_flow_detach(priv->mdev->dev, priv->tunnel_reg_id);

					priv->tunnel_reg_id = 0;

				}

				err = mlx4_en_tunnel_steer_add(priv, new_mac, qpn,

							       &priv->tunnel_reg_id);

				return err;

			}

		}

drivers/net/ethernet/mellanox/mlx4/fw.c

+3 −2
Original line number Diff line number Diff line
@@ -129,13 +129,14 @@ static void dump_dev_cap_flags2(struct mlx4_dev *dev, u64 flags) 
		[0] = "RSS support",

		[1] = "RSS Toeplitz Hash Function support",

		[2] = "RSS XOR Hash Function support",

		[3] = "Device manage flow steering support",

		[3] = "Device managed flow steering support",

		[4] = "Automatic MAC reassignment support",

		[5] = "Time stamping support",

		[6] = "VST (control vlan insertion/stripping) support",

		[7] = "FSM (MAC anti-spoofing) support",

		[8] = "Dynamic QP updates support",

		[9] = "TCP/IP offloads/flow-steering for VXLAN support"

		[9] = "Device managed flow steering IPoIB support",

		[10] = "TCP/IP offloads/flow-steering for VXLAN support"

	};

	int i;

drivers/net/ethernet/mellanox/mlx4/main.c

+1 −1
Original line number Diff line number Diff line
@@ -751,7 +751,7 @@ static void mlx4_request_modules(struct mlx4_dev *dev) 
			has_eth_port = true;

	}



	if (has_ib_port)

	if (has_ib_port || (dev->caps.flags & MLX4_DEV_CAP_FLAG_IBOE))

		request_module_nowait(IB_DRV_NAME);

	if (has_eth_port)

		request_module_nowait(EN_DRV_NAME);