diff options
Diffstat (limited to 'drivers/net/qlcnic/qlcnic.h')
-rw-r--r-- | drivers/net/qlcnic/qlcnic.h | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/drivers/net/qlcnic/qlcnic.h b/drivers/net/qlcnic/qlcnic.h index 31a0b430a9d7..02db363f20cd 100644 --- a/drivers/net/qlcnic/qlcnic.h +++ b/drivers/net/qlcnic/qlcnic.h | |||
@@ -51,8 +51,8 @@ | |||
51 | 51 | ||
52 | #define _QLCNIC_LINUX_MAJOR 5 | 52 | #define _QLCNIC_LINUX_MAJOR 5 |
53 | #define _QLCNIC_LINUX_MINOR 0 | 53 | #define _QLCNIC_LINUX_MINOR 0 |
54 | #define _QLCNIC_LINUX_SUBVERSION 2 | 54 | #define _QLCNIC_LINUX_SUBVERSION 3 |
55 | #define QLCNIC_LINUX_VERSIONID "5.0.2" | 55 | #define QLCNIC_LINUX_VERSIONID "5.0.3" |
56 | #define QLCNIC_DRV_IDC_VER 0x01 | 56 | #define QLCNIC_DRV_IDC_VER 0x01 |
57 | 57 | ||
58 | #define QLCNIC_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) | 58 | #define QLCNIC_VERSION_CODE(a, b, c) (((a) << 24) + ((b) << 16) + (c)) |
@@ -891,6 +891,7 @@ struct qlcnic_mac_req { | |||
891 | #define QLCNIC_LRO_ENABLED 0x08 | 891 | #define QLCNIC_LRO_ENABLED 0x08 |
892 | #define QLCNIC_BRIDGE_ENABLED 0X10 | 892 | #define QLCNIC_BRIDGE_ENABLED 0X10 |
893 | #define QLCNIC_DIAG_ENABLED 0x20 | 893 | #define QLCNIC_DIAG_ENABLED 0x20 |
894 | #define QLCNIC_NPAR_ENABLED 0x40 | ||
894 | #define QLCNIC_IS_MSI_FAMILY(adapter) \ | 895 | #define QLCNIC_IS_MSI_FAMILY(adapter) \ |
895 | ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED)) | 896 | ((adapter)->flags & (QLCNIC_MSI_ENABLED | QLCNIC_MSIX_ENABLED)) |
896 | 897 | ||
@@ -1159,13 +1160,6 @@ int qlcnic_check_loopback_buff(unsigned char *data); | |||
1159 | netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev); | 1160 | netdev_tx_t qlcnic_xmit_frame(struct sk_buff *skb, struct net_device *netdev); |
1160 | void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring); | 1161 | void qlcnic_process_rcv_ring_diag(struct qlcnic_host_sds_ring *sds_ring); |
1161 | 1162 | ||
1162 | /* Functions from qlcnic_vf.c */ | ||
1163 | int qlcnicvf_config_bridged_mode(struct qlcnic_adapter *, u32); | ||
1164 | int qlcnicvf_config_led(struct qlcnic_adapter *, u32, u32); | ||
1165 | int qlcnicvf_set_ilb_mode(struct qlcnic_adapter *adapter); | ||
1166 | void qlcnicvf_clear_ilb_mode(struct qlcnic_adapter *adapter); | ||
1167 | void qlcnicvf_set_port_mode(struct qlcnic_adapter *adapter); | ||
1168 | |||
1169 | /* Management functions */ | 1163 | /* Management functions */ |
1170 | int qlcnic_set_mac_address(struct qlcnic_adapter *, u8*); | 1164 | int qlcnic_set_mac_address(struct qlcnic_adapter *, u8*); |
1171 | int qlcnic_get_mac_address(struct qlcnic_adapter *, u8*); | 1165 | int qlcnic_get_mac_address(struct qlcnic_adapter *, u8*); |
@@ -1234,6 +1228,7 @@ struct qlcnic_nic_template { | |||
1234 | int (*config_led) (struct qlcnic_adapter *, u32, u32); | 1228 | int (*config_led) (struct qlcnic_adapter *, u32, u32); |
1235 | int (*set_ilb_mode) (struct qlcnic_adapter *); | 1229 | int (*set_ilb_mode) (struct qlcnic_adapter *); |
1236 | void (*clear_ilb_mode) (struct qlcnic_adapter *); | 1230 | void (*clear_ilb_mode) (struct qlcnic_adapter *); |
1231 | int (*start_firmware) (struct qlcnic_adapter *); | ||
1237 | }; | 1232 | }; |
1238 | 1233 | ||
1239 | #define QLCDB(adapter, lvl, _fmt, _args...) do { \ | 1234 | #define QLCDB(adapter, lvl, _fmt, _args...) do { \ |