]> Pileus Git - ~andy/linux/commitdiff
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)
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>

Trivial merge