Merge branch 'be2net'

Browse source

Sathya Perla says:

====================
be2net: patch set

Pls apply the following bug fixes to the 'net' tree. Thanks.

Suresh Reddy (2):
  be2net: increase the timeout value for loopback-test FW cmd
  be2net: fix max_evt_qs calculation for BE3 in SR-IOV config

Vasundhara Volam (1):
  be2net: disable RSS when number of RXQs is reduced to 1 via
    set-channels
====================

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

...

This commit is contained in:

David S. Miller 2014-01-06 13:09:26 -05:00

parent f35f76ee76 e3dc867c17

commit ce088848c2

3 changed files with 43 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

3

drivers/net/ethernet/emulex/benet/be.h

View file

33

drivers/net/ethernet/emulex/benet/be_cmds.c

View file

29

drivers/net/ethernet/emulex/benet/be_main.c

View file