aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/vmxnet3/vmxnet3_drv.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2013-03-07 15:52:33 -0500
committerDavid S. Miller <davem@davemloft.net>2013-03-07 15:52:33 -0500
commitc5b156794736142fa3120d488f260ff26da3d134 (patch)
treeaea8161b5ec5c7f9ffa6aa6e001f5a3f5ac32603 /drivers/net/vmxnet3/vmxnet3_drv.c
parent43b18db8a27fcd28c2bd290adf031ca04ea573ce (diff)
parenta229e488ac3f904d06c20d8d3f47831db3c7a15a (diff)
Merge branch 'mlx4'
Or Gerlitz says: ==================== Here's a batch of fixes to the mlx4 core and ethernet drivers for 3.9 The commit that disabled RFS when running in SRIOV mode fixes a regression which was introduced in 3.9-rc1 but actually present also in the 3.8 -stable series. It turns out that a slightly different fix is needed there and we will generate and submit it there. Patches done against net commit 66d29cbc59433 "benet: Wait f/w POST until timeout" ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/vmxnet3/vmxnet3_drv.c')
0 files changed, 0 insertions, 0 deletions