]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'qlcnic'
authorDavid S. Miller <davem@davemloft.net>
Mon, 13 Jan 2014 23:31:42 +0000 (15:31 -0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 13 Jan 2014 23:31:42 +0000 (15:31 -0800)
commite9089fb8f26eb78ce487fecda389ba43c84521ff
treecd706f5be73d7d4aa8ec57a15fe42b810be2c460
parentbe252f69c656f994dab263e9fe87b4a47f62fe59
parent5ee755149e8ff1cb562e2d8d79ac2b7ee477b6b3
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
  9fac6b78("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>