Merge branch 'mlx4-fixes'

Browse source

Tariq Toukan says:

====================
mlx4_en fixes for 4.7-rc

This small patchset includes two small fixes for mlx4_en driver.

One allows a clean shutdown even when clients do not release their
netdev reference.
The other adds error return values to the VLAN VID add/kill functions.
====================

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

...

This commit is contained in:

David S. Miller 2016-06-22 16:38:17 -04:00

parent 27777daa8b 9d76931180

commit acd43fe85b

3 changed files with 31 additions and 10 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

35

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

View file

5

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

View file

1

include/linux/mlx4/device.h

View file