Merge branch 'mlx5-fixes'

Browse source

Saeed Mahameed says:

====================
Mellanox mlx5 fixes and cleanups 2017-01-10

This series includes some mlx5e general cleanups from Daniel, Gil, Hadar
and myself.
Also it includes some critical mlx5e TC offloads fixes from Or Gerlitz.

For -stable:
 - net/mlx5e: Remove WARN_ONCE from adaptive moderation code

   Although this fix doesn't affect any functionality, I thought it is
   better to clean this -WARN_ONCE- up for -stable in case someone hits
   such corner case.

Please apply and let me know if there's any problem.
====================

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

...

This commit is contained in:

David S. Miller 2017-01-10 21:34:03 -05:00

parent 57ea52a865 5e44fca504

commit 6c711c8691

4 changed files with 75 additions and 44 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

13

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

View file

7

drivers/net/ethernet/mellanox/mlx5/core/en_rx_am.c

View file

93

drivers/net/ethernet/mellanox/mlx5/core/en_tc.c

View file

6

drivers/net/ethernet/mellanox/mlx5/core/main.c

View file