diff options
Diffstat (limited to 'drivers/net/ehea/ehea.h')
-rw-r--r-- | drivers/net/ehea/ehea.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index e595d6b38e7c..d593513f82d0 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <asm/io.h> | 39 | #include <asm/io.h> |
40 | 40 | ||
41 | #define DRV_NAME "ehea" | 41 | #define DRV_NAME "ehea" |
42 | #define DRV_VERSION "EHEA_0048" | 42 | #define DRV_VERSION "EHEA_0052" |
43 | 43 | ||
44 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ | 44 | #define EHEA_MSG_DEFAULT (NETIF_MSG_LINK | NETIF_MSG_TIMER \ |
45 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) | 45 | | NETIF_MSG_RX_ERR | NETIF_MSG_TX_ERR) |
@@ -78,8 +78,6 @@ | |||
78 | #define EHEA_RQ2_PKT_SIZE 1522 | 78 | #define EHEA_RQ2_PKT_SIZE 1522 |
79 | #define EHEA_L_PKT_SIZE 256 /* low latency */ | 79 | #define EHEA_L_PKT_SIZE 256 /* low latency */ |
80 | 80 | ||
81 | #define EHEA_POLL_MAX_RWQE 1000 | ||
82 | |||
83 | /* Send completion signaling */ | 81 | /* Send completion signaling */ |
84 | #define EHEA_SIG_IV_LONG 1 | 82 | #define EHEA_SIG_IV_LONG 1 |
85 | 83 | ||
@@ -357,8 +355,8 @@ struct ehea_port_res { | |||
357 | struct ehea_qp *qp; | 355 | struct ehea_qp *qp; |
358 | struct ehea_cq *send_cq; | 356 | struct ehea_cq *send_cq; |
359 | struct ehea_cq *recv_cq; | 357 | struct ehea_cq *recv_cq; |
360 | struct ehea_eq *send_eq; | 358 | struct ehea_eq *eq; |
361 | struct ehea_eq *recv_eq; | 359 | struct net_device *d_netdev; |
362 | spinlock_t send_lock; | 360 | spinlock_t send_lock; |
363 | struct ehea_q_skb_arr rq1_skba; | 361 | struct ehea_q_skb_arr rq1_skba; |
364 | struct ehea_q_skb_arr rq2_skba; | 362 | struct ehea_q_skb_arr rq2_skba; |
@@ -372,7 +370,6 @@ struct ehea_port_res { | |||
372 | int swqe_count; | 370 | int swqe_count; |
373 | u32 swqe_id_counter; | 371 | u32 swqe_id_counter; |
374 | u64 tx_packets; | 372 | u64 tx_packets; |
375 | struct tasklet_struct send_comp_task; | ||
376 | spinlock_t recv_lock; | 373 | spinlock_t recv_lock; |
377 | struct port_state p_state; | 374 | struct port_state p_state; |
378 | u64 rx_packets; | 375 | u64 rx_packets; |
@@ -416,7 +413,9 @@ struct ehea_port { | |||
416 | char int_aff_name[EHEA_IRQ_NAME_SIZE]; | 413 | char int_aff_name[EHEA_IRQ_NAME_SIZE]; |
417 | int allmulti; /* Indicates IFF_ALLMULTI state */ | 414 | int allmulti; /* Indicates IFF_ALLMULTI state */ |
418 | int promisc; /* Indicates IFF_PROMISC state */ | 415 | int promisc; /* Indicates IFF_PROMISC state */ |
416 | int num_tx_qps; | ||
419 | int num_add_tx_qps; | 417 | int num_add_tx_qps; |
418 | int num_mcs; | ||
420 | int resets; | 419 | int resets; |
421 | u64 mac_addr; | 420 | u64 mac_addr; |
422 | u32 logical_port_id; | 421 | u32 logical_port_id; |