Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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:
35b827b6d061 tun: forbid iface creation with rtnl ops
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

+3 -4
+1 -1
drivers/net/ethernet/mellanox/mlx4/Kconfig
··· 5 5 config MLX4_EN 6 6 tristate "Mellanox Technologies 1/10/40Gbit Ethernet support" 7 7 depends on MAY_USE_DEVLINK 8 - depends on PCI 8 + depends on PCI && NETDEVICES && ETHERNET && INET 9 9 select MLX4_CORE 10 10 imply PTP_1588_CLOCK 11 11 ---help---
+2 -2
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
··· 3493 3493 dev->gso_partial_features = NETIF_F_GSO_UDP_TUNNEL_CSUM; 3494 3494 } 3495 3495 3496 - /* MTU range: 46 - hw-specific max */ 3497 - dev->min_mtu = MLX4_EN_MIN_MTU; 3496 + /* MTU range: 68 - hw-specific max */ 3497 + dev->min_mtu = ETH_MIN_MTU; 3498 3498 dev->max_mtu = priv->max_mtu; 3499 3499 3500 3500 mdev->pndev[port] = dev;
-1
drivers/net/ethernet/mellanox/mlx4/mlx4_en.h
··· 161 161 #define MLX4_SELFTEST_LB_MIN_MTU (MLX4_LOOPBACK_TEST_PAYLOAD + NET_IP_ALIGN + \ 162 162 ETH_HLEN + PREAMBLE_LEN) 163 163 164 - #define MLX4_EN_MIN_MTU 46 165 164 /* VLAN_HLEN is added twice,to support skb vlan tagged with multiple 166 165 * headers. (For example: ETH_P_8021Q and ETH_P_8021AD). 167 166 */