diff options
| author | David S. Miller <davem@davemloft.net> | 2014-05-09 13:13:44 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-05-09 13:13:44 -0400 |
| commit | 97e72829d7c0efc9fe7768148ef490bc83ebce0e (patch) | |
| tree | e44775afd0fd1f06c7c6ff8bd14250227eac4e17 /net/ceph/snapshot.c | |
| parent | fe6f397c433c43a4404259d6ee3f1200b9a6d97e (diff) | |
| parent | b51aa36725909369c7c0c8e4dcb697efb2d31265 (diff) | |
Merge branch 'be2net-next'
Sathya Perla says:
====================
be2net: patch set
This patch set contains the following modificatons:
* three patches (1/7 to 3/7) that fix indentation style issues
* convert the u8 vlan[] array to a bit-map to reduce memory usage
* use MCCQ instead of MBOX in be_cmd_rss_config() as the MCCQ is already
created by that time
* include rx-comp-error counter in ethtool stats
* remove the unused promiscuous setting from be_cmd_vlan_config()
Pls apply to net-next tree. Thanks!
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ceph/snapshot.c')
0 files changed, 0 insertions, 0 deletions