Merge branch 'cxgb4'

Browse source

Hariprasad Shenai says:

====================
Misc. fixes for cxgb4 and cxgb4vf driver

This series of patch provides fixes for cxgb4 and cxgb4vf driver related to
rx checksum counter and decodes module type a bit more for ethtool output.

The patches series is created against David Miller's 'net-next' tree.

We would like to request this patch series to get merged via David Miller's
'net-next' tree.

We have included all the maintainers of respective drivers. Kindly review the
change and let us know in case of any review comments.
====================

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

...

This commit is contained in:

David S. Miller 2014-05-12 12:48:25 -04:00

parent 163cd4e817 c3136f5540

commit 51ee42efa0

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

15

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

View file

6

drivers/net/ethernet/chelsio/cxgb4/sge.c

View file

7

drivers/net/ethernet/chelsio/cxgb4vf/sge.c

View file