diff options
| author | David S. Miller <davem@davemloft.net> | 2018-07-31 14:34:45 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-07-31 14:34:45 -0700 |
| commit | e39eb599998ac4d8721af23f7da8710950a07823 (patch) | |
| tree | b9ee6518a1d1cd768af2577a32a65cfd1523f922 /drivers/net/ethernet/mellanox/mlx5/core/en_main.c | |
| parent | 6751e7c66cb8689491b89fe02c71d1d44394412b (diff) | |
| parent | 8e1d162d8e81838119de18b4ca1e302ce906f2a6 (diff) | |
| download | 96b-common-e39eb599998ac4d8721af23f7da8710950a07823.tar.gz | |
Merge tag 'mlx5-fixes-2018-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
Mellanox, mlx5 fixes 2018-07-31
The following series includes four mlx5 fixes.
Please pull and let me know if there's any problem.
For -stable v4.14
net/mlx5e: E-Switch, Initialize eswitch only if eswitch manager
For -stable v4.16
net/mlx5e: Set port trust mode to PCP as default
For -stable v4.17
net/mlx5e: IPoIB, Set the netdevice sw mtu in ipoib enhanced flow
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx5/core/en_main.c')
| -rw-r--r-- | drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c index dae4156a710d..c592678ab5f1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@ -3712,7 +3712,8 @@ int mlx5e_change_mtu(struct net_device *netdev, int new_mtu, if (!reset) { params->sw_mtu = new_mtu; - set_mtu_cb(priv); + if (set_mtu_cb) + set_mtu_cb(priv); netdev->mtu = params->sw_mtu; goto out; } |