diff options
| author | Manish Chopra <manish.chopra@qlogic.com> | 2013-08-30 13:51:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-08-31 22:34:43 -0400 |
| commit | 991ca269ed71b2b7aee27f5cb8bf64b689cc20bf (patch) | |
| tree | aa98ffd7e41853d8984f4579e01461c9d9a47054 /drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |
| parent | eb3c0d83cc78361a28e52e514a7095fdbf771e7e (diff) | |
| download | blackbird-op-linux-991ca269ed71b2b7aee27f5cb8bf64b689cc20bf.tar.gz blackbird-op-linux-991ca269ed71b2b7aee27f5cb8bf64b689cc20bf.zip | |
qlcnic: Enhance PVID handling for 84xx adapters
o PF driver should not indicate PVID configuration to VF driver.
As adapter supports VLAN stripping, VF driver should stay agnostic
to any PVID configuration.
o Return "QLC_NO_VLAN_MODE(= 0)" to VFD when PVID is configured.
VF driver should be in no VLAN configuration mode.
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic.h')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 22bd425cfd84..16df5fec0333 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h @@ -2069,6 +2069,14 @@ static inline bool qlcnic_82xx_check(struct qlcnic_adapter *adapter) return (device == PCI_DEVICE_ID_QLOGIC_QLE824X) ? true : false; } +static inline bool qlcnic_84xx_check(struct qlcnic_adapter *adapter) +{ + unsigned short device = adapter->pdev->device; + + return ((device == PCI_DEVICE_ID_QLOGIC_QLE844X) || + (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X)) ? true : false; +} + static inline bool qlcnic_83xx_check(struct qlcnic_adapter *adapter) { unsigned short device = adapter->pdev->device; |
