diff options
Diffstat (limited to 'drivers/net/ehea/ehea_main.c')
-rw-r--r-- | drivers/net/ehea/ehea_main.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c index 53c0f04b1b2..6a0a8fca62b 100644 --- a/drivers/net/ehea/ehea_main.c +++ b/drivers/net/ehea/ehea_main.c | |||
@@ -41,6 +41,7 @@ | |||
41 | #include <linux/memory.h> | 41 | #include <linux/memory.h> |
42 | #include <asm/kexec.h> | 42 | #include <asm/kexec.h> |
43 | #include <linux/mutex.h> | 43 | #include <linux/mutex.h> |
44 | #include <linux/prefetch.h> | ||
44 | 45 | ||
45 | #include <net/ip.h> | 46 | #include <net/ip.h> |
46 | 47 | ||
@@ -2688,9 +2689,6 @@ static int ehea_open(struct net_device *dev) | |||
2688 | netif_start_queue(dev); | 2689 | netif_start_queue(dev); |
2689 | } | 2690 | } |
2690 | 2691 | ||
2691 | init_waitqueue_head(&port->swqe_avail_wq); | ||
2692 | init_waitqueue_head(&port->restart_wq); | ||
2693 | |||
2694 | mutex_unlock(&port->port_lock); | 2692 | mutex_unlock(&port->port_lock); |
2695 | 2693 | ||
2696 | return ret; | 2694 | return ret; |
@@ -3265,10 +3263,12 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | |||
3265 | dev->netdev_ops = &ehea_netdev_ops; | 3263 | dev->netdev_ops = &ehea_netdev_ops; |
3266 | ehea_set_ethtool_ops(dev); | 3264 | ehea_set_ethtool_ops(dev); |
3267 | 3265 | ||
3266 | dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | ||
3267 | | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | NETIF_F_LRO; | ||
3268 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | 3268 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
3269 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | 3269 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX |
3270 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | 3270 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER |
3271 | | NETIF_F_LLTX; | 3271 | | NETIF_F_LLTX | NETIF_F_RXCSUM; |
3272 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; | 3272 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; |
3273 | 3273 | ||
3274 | if (use_lro) | 3274 | if (use_lro) |
@@ -3276,6 +3276,9 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | |||
3276 | 3276 | ||
3277 | INIT_WORK(&port->reset_task, ehea_reset_port); | 3277 | INIT_WORK(&port->reset_task, ehea_reset_port); |
3278 | 3278 | ||
3279 | init_waitqueue_head(&port->swqe_avail_wq); | ||
3280 | init_waitqueue_head(&port->restart_wq); | ||
3281 | |||
3279 | ret = register_netdev(dev); | 3282 | ret = register_netdev(dev); |
3280 | if (ret) { | 3283 | if (ret) { |
3281 | pr_err("register_netdev failed. ret=%d\n", ret); | 3284 | pr_err("register_netdev failed. ret=%d\n", ret); |