diff options
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic.h')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h index 055f3763e577..06bcc734fe8d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | |||
@@ -24,9 +24,7 @@ | |||
24 | #include <linux/mii.h> | 24 | #include <linux/mii.h> |
25 | #include <linux/timer.h> | 25 | #include <linux/timer.h> |
26 | #include <linux/irq.h> | 26 | #include <linux/irq.h> |
27 | |||
28 | #include <linux/vmalloc.h> | 27 | #include <linux/vmalloc.h> |
29 | |||
30 | #include <linux/io.h> | 28 | #include <linux/io.h> |
31 | #include <asm/byteorder.h> | 29 | #include <asm/byteorder.h> |
32 | #include <linux/bitops.h> | 30 | #include <linux/bitops.h> |
@@ -39,8 +37,8 @@ | |||
39 | 37 | ||
40 | #define _QLCNIC_LINUX_MAJOR 5 | 38 | #define _QLCNIC_LINUX_MAJOR 5 |
41 | #define _QLCNIC_LINUX_MINOR 3 | 39 | #define _QLCNIC_LINUX_MINOR 3 |
42 | #define _QLCNIC_LINUX_SUBVERSION 62 | 40 | #define _QLCNIC_LINUX_SUBVERSION 63 |
43 | #define QLCNIC_LINUX_VERSIONID "5.3.62" | 41 | #define QLCNIC_LINUX_VERSIONID "5.3.63" |
44 | #define QLCNIC_DRV_IDC_VER 0x01 | 42 | #define QLCNIC_DRV_IDC_VER 0x01 |
45 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ | 43 | #define QLCNIC_DRIVER_VERSION ((_QLCNIC_LINUX_MAJOR << 16) |\ |
46 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) | 44 | (_QLCNIC_LINUX_MINOR << 8) | (_QLCNIC_LINUX_SUBVERSION)) |
@@ -926,6 +924,7 @@ struct qlcnic_mac_vlan_list { | |||
926 | #define QLCNIC_FW_CAPABILITY_SET_DRV_VER BIT_5 | 924 | #define QLCNIC_FW_CAPABILITY_SET_DRV_VER BIT_5 |
927 | #define QLCNIC_FW_CAPABILITY_2_BEACON BIT_7 | 925 | #define QLCNIC_FW_CAPABILITY_2_BEACON BIT_7 |
928 | #define QLCNIC_FW_CAPABILITY_2_PER_PORT_ESWITCH_CFG BIT_9 | 926 | #define QLCNIC_FW_CAPABILITY_2_PER_PORT_ESWITCH_CFG BIT_9 |
927 | #define QLCNIC_FW_CAPABILITY_2_EXT_ISCSI_DUMP BIT_13 | ||
929 | 928 | ||
930 | #define QLCNIC_83XX_FW_CAPAB_ENCAP_RX_OFFLOAD BIT_0 | 929 | #define QLCNIC_83XX_FW_CAPAB_ENCAP_RX_OFFLOAD BIT_0 |
931 | #define QLCNIC_83XX_FW_CAPAB_ENCAP_TX_OFFLOAD BIT_1 | 930 | #define QLCNIC_83XX_FW_CAPAB_ENCAP_TX_OFFLOAD BIT_1 |
@@ -2291,8 +2290,9 @@ extern const struct ethtool_ops qlcnic_ethtool_failed_ops; | |||
2291 | 2290 | ||
2292 | #define PCI_DEVICE_ID_QLOGIC_QLE824X 0x8020 | 2291 | #define PCI_DEVICE_ID_QLOGIC_QLE824X 0x8020 |
2293 | #define PCI_DEVICE_ID_QLOGIC_QLE834X 0x8030 | 2292 | #define PCI_DEVICE_ID_QLOGIC_QLE834X 0x8030 |
2294 | #define PCI_DEVICE_ID_QLOGIC_QLE8830 0x8830 | ||
2295 | #define PCI_DEVICE_ID_QLOGIC_VF_QLE834X 0x8430 | 2293 | #define PCI_DEVICE_ID_QLOGIC_VF_QLE834X 0x8430 |
2294 | #define PCI_DEVICE_ID_QLOGIC_QLE8830 0x8830 | ||
2295 | #define PCI_DEVICE_ID_QLOGIC_VF_QLE8C30 0x8C30 | ||
2296 | #define PCI_DEVICE_ID_QLOGIC_QLE844X 0x8040 | 2296 | #define PCI_DEVICE_ID_QLOGIC_QLE844X 0x8040 |
2297 | #define PCI_DEVICE_ID_QLOGIC_VF_QLE844X 0x8440 | 2297 | #define PCI_DEVICE_ID_QLOGIC_VF_QLE844X 0x8440 |
2298 | 2298 | ||
@@ -2319,7 +2319,8 @@ static inline bool qlcnic_83xx_check(struct qlcnic_adapter *adapter) | |||
2319 | (device == PCI_DEVICE_ID_QLOGIC_QLE8830) || | 2319 | (device == PCI_DEVICE_ID_QLOGIC_QLE8830) || |
2320 | (device == PCI_DEVICE_ID_QLOGIC_QLE844X) || | 2320 | (device == PCI_DEVICE_ID_QLOGIC_QLE844X) || |
2321 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X) || | 2321 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X) || |
2322 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X)) ? true : false; | 2322 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) || |
2323 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE8C30)) ? true : false; | ||
2323 | 2324 | ||
2324 | return status; | 2325 | return status; |
2325 | } | 2326 | } |
@@ -2335,7 +2336,8 @@ static inline bool qlcnic_sriov_vf_check(struct qlcnic_adapter *adapter) | |||
2335 | bool status; | 2336 | bool status; |
2336 | 2337 | ||
2337 | status = ((device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) || | 2338 | status = ((device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) || |
2338 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X)) ? true : false; | 2339 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE844X) || |
2340 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE8C30)) ? true : false; | ||
2339 | 2341 | ||
2340 | return status; | 2342 | return status; |
2341 | } | 2343 | } |
@@ -2351,7 +2353,8 @@ static inline bool qlcnic_83xx_vf_check(struct qlcnic_adapter *adapter) | |||
2351 | { | 2353 | { |
2352 | unsigned short device = adapter->pdev->device; | 2354 | unsigned short device = adapter->pdev->device; |
2353 | 2355 | ||
2354 | return (device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) ? true : false; | 2356 | return ((device == PCI_DEVICE_ID_QLOGIC_VF_QLE834X) || |
2357 | (device == PCI_DEVICE_ID_QLOGIC_VF_QLE8C30)) ? true : false; | ||
2355 | } | 2358 | } |
2356 | 2359 | ||
2357 | static inline bool qlcnic_sriov_check(struct qlcnic_adapter *adapter) | 2360 | static inline bool qlcnic_sriov_check(struct qlcnic_adapter *adapter) |