diff options
author | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-01-11 14:43:39 -0500 |
commit | 02ac5d1487115d160fab4c3e61b7edc20a945af9 (patch) | |
tree | 08a39341379ce6f1ad4f3997df36c76ee82cee9c /drivers/net/ethernet/mellanox/mlx4/en_netdev.c | |
parent | 265592a1dfc31ecab02a960721a1f137e50afb17 (diff) | |
parent | ba836a6f5ab1243ff5e08a941a2d1de8b31244e1 (diff) | |
download | linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.gz linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.tar.bz2 linux-02ac5d1487115d160fab4c3e61b7edc20a945af9.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Two AF_* families adding entries to the lockdep tables
at the same time.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/mellanox/mlx4/en_netdev.c')
-rw-r--r-- | drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c index 06ef23f040a4..12c6686fa43b 100644 --- a/drivers/net/ethernet/mellanox/mlx4/en_netdev.c +++ b/drivers/net/ethernet/mellanox/mlx4/en_netdev.c @@ -2275,7 +2275,7 @@ static int mlx4_en_change_mtu(struct net_device *dev, int new_mtu) if (priv->tx_ring_num[TX_XDP] && !mlx4_en_check_xdp_mtu(dev, new_mtu)) - return -ENOTSUPP; + return -EOPNOTSUPP; dev->mtu = new_mtu; |