diff options
author | David S. Miller <davem@davemloft.net> | 2015-06-04 08:40:20 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-06-04 08:40:20 +0200 |
commit | 22793e5d5f65b45e95492a08e0019fd669752607 (patch) | |
tree | 6f9265f106bb7f1763fbfd4a06a60cc653af9824 /drivers/net/wireless/mwifiex/usb.c | |
parent | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge (diff) | |
parent | cxgb4: Remove WOL get/set ethtool support (diff) | |
download | linux-22793e5d5f65b45e95492a08e0019fd669752607.tar.xz linux-22793e5d5f65b45e95492a08e0019fd669752607.zip |
Merge branch 'cxgb4-next'
Hariprasad Shenai says:
====================
cxgb4: Adds support for various ethtool stats
This patch series adds the following:
Adds support to dump adapter specific stats in ethtool
Adds support to dump channel stats in ethtool
Adds support to dump loopback port stats in ethtool
Remove wake-on-lan get/set ethtool support
This patch series has been created against net-next tree and includes
patches on cxgb4 driver.
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>
Diffstat (limited to 'drivers/net/wireless/mwifiex/usb.c')
0 files changed, 0 insertions, 0 deletions