diff options
-rw-r--r-- | drivers/net/ehea/ehea.h | 3 | ||||
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ehea/ehea.h b/drivers/net/ehea/ehea.h index 9930d5f8b9e1..6271b9411ccf 100644 --- a/drivers/net/ehea/ehea.h +++ b/drivers/net/ehea/ehea.h | |||
@@ -478,7 +478,7 @@ struct ehea_port { | |||
478 | int num_add_tx_qps; | 478 | int num_add_tx_qps; |
479 | int num_mcs; | 479 | int num_mcs; |
480 | int resets; | 480 | int resets; |
481 | u64 flags; | 481 | unsigned long flags; |
482 | u64 mac_addr; | 482 | u64 mac_addr; |
483 | u32 logical_port_id; | 483 | u32 logical_port_id; |
484 | u32 port_speed; | 484 | u32 port_speed; |
@@ -510,7 +510,6 @@ void ehea_set_ethtool_ops(struct net_device *netdev); | |||
510 | int ehea_sense_port_attr(struct ehea_port *port); | 510 | int ehea_sense_port_attr(struct ehea_port *port); |
511 | int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); | 511 | int ehea_set_portspeed(struct ehea_port *port, u32 port_speed); |
512 | 512 | ||
513 | extern u64 ehea_driver_flags; | ||
514 | extern struct work_struct ehea_rereg_mr_task; | 513 | extern struct work_struct ehea_rereg_mr_task; |
515 | 514 | ||
516 | #endif /* __EHEA_H__ */ | 515 | #endif /* __EHEA_H__ */ |
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index a2f1905a23df..e3131ea629cd 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -99,7 +99,7 @@ MODULE_PARM_DESC(use_lro, " Large Receive Offload, 1: enable, 0: disable, " | |||
99 | 99 | ||
100 | static int port_name_cnt; | 100 | static int port_name_cnt; |
101 | static LIST_HEAD(adapter_list); | 101 | static LIST_HEAD(adapter_list); |
102 | u64 ehea_driver_flags; | 102 | static unsigned long ehea_driver_flags; |
103 | struct work_struct ehea_rereg_mr_task; | 103 | struct work_struct ehea_rereg_mr_task; |
104 | static DEFINE_MUTEX(dlpar_mem_lock); | 104 | static DEFINE_MUTEX(dlpar_mem_lock); |
105 | struct ehea_fw_handle_array ehea_fw_handles; | 105 | struct ehea_fw_handle_array ehea_fw_handles; |