aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ehea/ehea.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/ehea/ehea.h')
-rw-r--r--drivers/net/ehea/ehea.h21
1 files changed, 5 insertions, 16 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h
index 1846623c6ae6..6c7257bd73fc 100644
--- a/drivers/net/ehea/ehea.h
+++ b/drivers/net/ehea/ehea.h
@@ -40,7 +40,7 @@
40#include <asm/io.h> 40#include <asm/io.h>
41 41
42#define DRV_NAME "ehea" 42#define DRV_NAME "ehea"
43#define DRV_VERSION "EHEA_0106" 43#define DRV_VERSION "EHEA_0107"
44 44
45/* eHEA capability flags */ 45/* eHEA capability flags */
46#define DLPAR_PORT_ADD_REM 1 46#define DLPAR_PORT_ADD_REM 1
@@ -130,19 +130,6 @@
130 130
131/* utility functions */ 131/* utility functions */
132 132
133#define ehea_info(fmt, args...) \
134 printk(KERN_INFO DRV_NAME ": " fmt "\n", ## args)
135
136#define ehea_error(fmt, args...) \
137 printk(KERN_ERR DRV_NAME ": Error in %s: " fmt "\n", __func__, ## args)
138
139#ifdef DEBUG
140#define ehea_debug(fmt, args...) \
141 printk(KERN_DEBUG DRV_NAME ": " fmt, ## args)
142#else
143#define ehea_debug(fmt, args...) do {} while (0)
144#endif
145
146void ehea_dump(void *adr, int len, char *msg); 133void ehea_dump(void *adr, int len, char *msg);
147 134
148#define EHEA_BMASK(pos, length) (((pos) << 16) + (length)) 135#define EHEA_BMASK(pos, length) (((pos) << 16) + (length))
@@ -396,7 +383,9 @@ struct ehea_port_res {
396 int swqe_ll_count; 383 int swqe_ll_count;
397 u32 swqe_id_counter; 384 u32 swqe_id_counter;
398 u64 tx_packets; 385 u64 tx_packets;
386 u64 tx_bytes;
399 u64 rx_packets; 387 u64 rx_packets;
388 u64 rx_bytes;
400 u32 poll_counter; 389 u32 poll_counter;
401 struct net_lro_mgr lro_mgr; 390 struct net_lro_mgr lro_mgr;
402 struct net_lro_desc lro_desc[MAX_LRO_DESCRIPTORS]; 391 struct net_lro_desc lro_desc[MAX_LRO_DESCRIPTORS];
@@ -491,6 +480,8 @@ struct ehea_port {
491 u8 full_duplex; 480 u8 full_duplex;
492 u8 autoneg; 481 u8 autoneg;
493 u8 num_def_qps; 482 u8 num_def_qps;
483 wait_queue_head_t swqe_avail_wq;
484 wait_queue_head_t restart_wq;
494}; 485};
495 486
496struct port_res_cfg { 487struct port_res_cfg {
@@ -511,6 +502,4 @@ void ehea_set_ethtool_ops(struct net_device *netdev);
511int ehea_sense_port_attr(struct ehea_port *port); 502int ehea_sense_port_attr(struct ehea_port *port);
512int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); 503int ehea_set_portspeed(struct ehea_port *port, u32 port_speed);
513 504
514extern struct work_struct ehea_rereg_mr_task;
515
516#endif /* __EHEA_H__ */ 505#endif /* __EHEA_H__ */