From: David S. Miller <davem@davemloft.net>
Date: Mon, 13 Jan 2014 23:31:42 +0000 (-0800)
Subject: Merge branch 'qlcnic'
X-Git-Tag: firefly_0821_release~176^2~4570^2~205
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b92ed1688e316d1b4410559272e68b246bdc7d0a;p=firefly-linux-kernel-4.4.55.git

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>
---

b92ed1688e316d1b4410559272e68b246bdc7d0a