aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/qlogic/qlge/qlge.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlge/qlge.h')
-rw-r--r--drivers/net/ethernet/qlogic/qlge/qlge.h13
1 files changed, 11 insertions, 2 deletions
diff --git a/drivers/net/ethernet/qlogic/qlge/qlge.h b/drivers/net/ethernet/qlogic/qlge/qlge.h
index 5a639df33f18..a131d7b5d2fe 100644
--- a/drivers/net/ethernet/qlogic/qlge/qlge.h
+++ b/drivers/net/ethernet/qlogic/qlge/qlge.h
@@ -18,13 +18,15 @@
18 */ 18 */
19#define DRV_NAME "qlge" 19#define DRV_NAME "qlge"
20#define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver " 20#define DRV_STRING "QLogic 10 Gigabit PCI-E Ethernet Driver "
21#define DRV_VERSION "v1.00.00.30.00.00-01" 21#define DRV_VERSION "v1.00.00.31"
22 22
23#define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */ 23#define WQ_ADDR_ALIGN 0x3 /* 4 byte alignment */
24 24
25#define QLGE_VENDOR_ID 0x1077 25#define QLGE_VENDOR_ID 0x1077
26#define QLGE_DEVICE_ID_8012 0x8012 26#define QLGE_DEVICE_ID_8012 0x8012
27#define QLGE_DEVICE_ID_8000 0x8000 27#define QLGE_DEVICE_ID_8000 0x8000
28#define QLGE_MEZZ_SSYS_ID_068 0x0068
29#define QLGE_MEZZ_SSYS_ID_180 0x0180
28#define MAX_CPUS 8 30#define MAX_CPUS 8
29#define MAX_TX_RINGS MAX_CPUS 31#define MAX_TX_RINGS MAX_CPUS
30#define MAX_RX_RINGS ((MAX_CPUS * 2) + 1) 32#define MAX_RX_RINGS ((MAX_CPUS * 2) + 1)
@@ -1397,7 +1399,6 @@ struct tx_ring {
1397 struct tx_ring_desc *q; /* descriptor list for the queue */ 1399 struct tx_ring_desc *q; /* descriptor list for the queue */
1398 spinlock_t lock; 1400 spinlock_t lock;
1399 atomic_t tx_count; /* counts down for every outstanding IO */ 1401 atomic_t tx_count; /* counts down for every outstanding IO */
1400 atomic_t queue_stopped; /* Turns queue off when full. */
1401 struct delayed_work tx_work; 1402 struct delayed_work tx_work;
1402 struct ql_adapter *qdev; 1403 struct ql_adapter *qdev;
1403 u64 tx_packets; 1404 u64 tx_packets;
@@ -1535,6 +1536,14 @@ struct nic_stats {
1535 u64 rx_1024_to_1518_pkts; 1536 u64 rx_1024_to_1518_pkts;
1536 u64 rx_1519_to_max_pkts; 1537 u64 rx_1519_to_max_pkts;
1537 u64 rx_len_err_pkts; 1538 u64 rx_len_err_pkts;
1539 /* Receive Mac Err stats */
1540 u64 rx_code_err;
1541 u64 rx_oversize_err;
1542 u64 rx_undersize_err;
1543 u64 rx_preamble_err;
1544 u64 rx_frame_len_err;
1545 u64 rx_crc_err;
1546 u64 rx_err_count;
1538 /* 1547 /*
1539 * These stats come from offset 500h to 5C8h 1548 * These stats come from offset 500h to 5C8h
1540 * in the XGMAC register. 1549 * in the XGMAC register.