diff options
| author | David S. Miller <davem@davemloft.net> | 2014-01-14 03:31:42 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-01-14 03:31:42 +0400 |
| commit | b92ed1688e316d1b4410559272e68b246bdc7d0a (patch) | |
| tree | cd706f5be73d7d4aa8ec57a15fe42b810be2c460 /arch/cris | |
| parent | 2315dc91a5059d7da9a8b9b9daf78d695c11383e (diff) | |
| parent | db5ee75d1e9d1fc15403e3f20a1be5b37790714c (diff) | |
| download | linux-b92ed1688e316d1b4410559272e68b246bdc7d0a.tar.xz | |
Merge branch 'qlcnic'
Shahed Shaikh says:
====================
This series includes following changes:
o SRIOV and VLAN filtering related enhancements which includes
- Do MAC learning for PF
- Restrict VF from configuring any VLAN mode
- Enable flooding on PF
- Turn on promiscuous mode for PF
o Bug fix in qlcnic_sriov_cleanup() introduced by commit
154d0c81("qlcnic: VLAN enhancement for 84XX adapters")
o Beaconing support for 83xx and 84xx series adapters
o Allow 82xx adapter to perform IPv6 LRO even if destination IP address is not
programmed.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/cris')
0 files changed, 0 insertions, 0 deletions