Merge branch 'mlx4'

Browse source

Or Gerlitz says:

====================
Here's a batch of mlx4 driver fixes for 3.9, mostly SRIOV/Flow-steering
related. Series done against the net tree as of commit 5a3da1f
"inet: limit length of fragment queue hash table bucket lists
====================

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

...

This commit is contained in:

David S. Miller 2013-03-21 12:05:32 -04:00

parent ce16294fda 2c473ae7e5

commit b37391e68c

3 changed files with 47 additions and 22 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

22

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

View file

2

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

View file

45

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

View file