diff options
author | Anton Blanchard <anton@samba.org> | 2011-10-14 01:30:58 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-10-17 19:00:54 -0400 |
commit | 3f7947b9f069c125ffdedc75ac9c4e3101fc2c6a (patch) | |
tree | 650ca10ea6b4375cee99c1b0c1295f18a20bad11 | |
parent | 41ebe9cde738a972d05c7282e09f5ed54cff0e8d (diff) |
ehea: Remove NETIF_F_LLTX
Remove the deprecated NETIF_F_LLTX feature. Since the network stack
now provides the locking we can remove the driver specific
pr->xmit_lock.
Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea.h | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/ibm/ehea/ehea_main.c | 12 |
2 files changed, 2 insertions, 11 deletions
diff --git a/drivers/net/ethernet/ibm/ehea/ehea.h b/drivers/net/ethernet/ibm/ehea/ehea.h index 0b8e6a97a98..5b5c1b5ce31 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea.h +++ b/drivers/net/ethernet/ibm/ehea/ehea.h | |||
@@ -363,7 +363,6 @@ struct ehea_port_res { | |||
363 | struct port_stats p_stats; | 363 | struct port_stats p_stats; |
364 | struct ehea_mr send_mr; /* send memory region */ | 364 | struct ehea_mr send_mr; /* send memory region */ |
365 | struct ehea_mr recv_mr; /* receive memory region */ | 365 | struct ehea_mr recv_mr; /* receive memory region */ |
366 | spinlock_t xmit_lock; | ||
367 | struct ehea_port *port; | 366 | struct ehea_port *port; |
368 | char int_recv_name[EHEA_IRQ_NAME_SIZE]; | 367 | char int_recv_name[EHEA_IRQ_NAME_SIZE]; |
369 | char int_send_name[EHEA_IRQ_NAME_SIZE]; | 368 | char int_send_name[EHEA_IRQ_NAME_SIZE]; |
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index dfefe809c48..ce9a6703272 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c | |||
@@ -1534,7 +1534,6 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr, | |||
1534 | pr->rx_packets = rx_packets; | 1534 | pr->rx_packets = rx_packets; |
1535 | 1535 | ||
1536 | pr->port = port; | 1536 | pr->port = port; |
1537 | spin_lock_init(&pr->xmit_lock); | ||
1538 | spin_lock_init(&pr->netif_queue); | 1537 | spin_lock_init(&pr->netif_queue); |
1539 | 1538 | ||
1540 | pr->eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0); | 1539 | pr->eq = ehea_create_eq(adapter, eq_type, EHEA_MAX_ENTRIES_EQ, 0); |
@@ -2254,14 +2253,9 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2254 | 2253 | ||
2255 | pr = &port->port_res[ehea_hash_skb(skb, port->num_tx_qps)]; | 2254 | pr = &port->port_res[ehea_hash_skb(skb, port->num_tx_qps)]; |
2256 | 2255 | ||
2257 | if (!spin_trylock(&pr->xmit_lock)) | 2256 | if (pr->queue_stopped) |
2258 | return NETDEV_TX_BUSY; | 2257 | return NETDEV_TX_BUSY; |
2259 | 2258 | ||
2260 | if (pr->queue_stopped) { | ||
2261 | spin_unlock(&pr->xmit_lock); | ||
2262 | return NETDEV_TX_BUSY; | ||
2263 | } | ||
2264 | |||
2265 | swqe = ehea_get_swqe(pr->qp, &swqe_index); | 2259 | swqe = ehea_get_swqe(pr->qp, &swqe_index); |
2266 | memset(swqe, 0, SWQE_HEADER_SIZE); | 2260 | memset(swqe, 0, SWQE_HEADER_SIZE); |
2267 | atomic_dec(&pr->swqe_avail); | 2261 | atomic_dec(&pr->swqe_avail); |
@@ -2325,8 +2319,6 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
2325 | } | 2319 | } |
2326 | spin_unlock_irqrestore(&pr->netif_queue, flags); | 2320 | spin_unlock_irqrestore(&pr->netif_queue, flags); |
2327 | } | 2321 | } |
2328 | dev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */ | ||
2329 | spin_unlock(&pr->xmit_lock); | ||
2330 | 2322 | ||
2331 | return NETDEV_TX_OK; | 2323 | return NETDEV_TX_OK; |
2332 | } | 2324 | } |
@@ -3233,7 +3225,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, | |||
3233 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO | 3225 | dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO |
3234 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX | 3226 | | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX |
3235 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER | 3227 | | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER |
3236 | | NETIF_F_LLTX | NETIF_F_RXCSUM; | 3228 | | NETIF_F_RXCSUM; |
3237 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; | 3229 | dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT; |
3238 | 3230 | ||
3239 | if (use_lro) | 3231 | if (use_lro) |