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

Merge branch 'mlx4-fixes' 



Tariq Toukan says:

====================
mlx4 fixes for 4.20-rc

This patchset includes small fixes for the mlx4_en driver.

First patch by Eran fixes the value used to init the netdevice's
min_mtu field.
Please queue it to -stable >= v4.10.

Second patch by Saeed adds missing Kconfig build dependencies.

Series generated against net commit:
35b827b6 tun: forbid iface creation with rtnl ops
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bf29e9e9 1b603f9e

drivers/net/ethernet/mellanox/mlx4/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
config MLX4_EN

config MLX4_EN

	tristate "Mellanox Technologies 1/10/40Gbit Ethernet support"

	tristate "Mellanox Technologies 1/10/40Gbit Ethernet support"

	depends on MAY_USE_DEVLINK

	depends on MAY_USE_DEVLINK

	depends on PCI

	depends on PCI && NETDEVICES && ETHERNET && INET

	select MLX4_CORE

	select MLX4_CORE

	imply PTP_1588_CLOCK

	imply PTP_1588_CLOCK

	---help---

	---help---

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -3493,8 +3493,8 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, 
		dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;

		dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM;

	}

	}





	/* MTU range: 46 - hw-specific max */

	/* MTU range: 68 - hw-specific max */

	dev->min_mtu = MLX4_EN_MIN_MTU;

	dev->min_mtu = ETH_MIN_MTU;

	dev->max_mtu = priv->max_mtu;

	dev->max_mtu = priv->max_mtu;





	mdev->pndev[port] = dev;

	mdev->pndev[port] = dev;

drivers/net/ethernet/mellanox/mlx4/mlx4_en.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -161,7 +161,6 @@ 
#define MLX4_SELFTEST_LB_MIN_MTU (MLX4_LOOPBACK_TEST_PAYLOAD + NET_IP_ALIGN + \

#define MLX4_SELFTEST_LB_MIN_MTU (MLX4_LOOPBACK_TEST_PAYLOAD + NET_IP_ALIGN + \

				  ETH_HLEN + PREAMBLE_LEN)

				  ETH_HLEN + PREAMBLE_LEN)





#define MLX4_EN_MIN_MTU		46

/* VLAN_HLEN is added twice,to support skb vlan tagged with multiple

/* VLAN_HLEN is added twice,to support skb vlan tagged with multiple

 * headers. (For example: ETH_P_8021Q and ETH_P_8021AD).

 * headers. (For example: ETH_P_8021Q and ETH_P_8021AD).

 */

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE