Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f7947b9 authored by Anton Blanchard's avatar Anton Blanchard Committed by David S. Miller
Browse files

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: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41ebe9cd

drivers/net/ethernet/ibm/ehea/ehea.h

+0 −1
Original line number Diff line number Diff line
@@ -363,7 +363,6 @@ struct ehea_port_res { 
	struct port_stats p_stats;

	struct ehea_mr send_mr;       	/* send memory region */

	struct ehea_mr recv_mr;       	/* receive memory region */

	spinlock_t xmit_lock;

	struct ehea_port *port;

	char int_recv_name[EHEA_IRQ_NAME_SIZE];

	char int_send_name[EHEA_IRQ_NAME_SIZE];

drivers/net/ethernet/ibm/ehea/ehea_main.c

+2 −10
Original line number Diff line number Diff line
@@ -1534,7 +1534,6 @@ static int ehea_init_port_res(struct ehea_port *port, struct ehea_port_res *pr, 
	pr->rx_packets = rx_packets;



	pr->port = port;

	spin_lock_init(&pr->xmit_lock);

	spin_lock_init(&pr->netif_queue);



	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) 


	pr = &port->port_res[ehea_hash_skb(skb, port->num_tx_qps)];



	if (!spin_trylock(&pr->xmit_lock))

	if (pr->queue_stopped)

		return NETDEV_TX_BUSY;



	if (pr->queue_stopped) {

		spin_unlock(&pr->xmit_lock);

		return NETDEV_TX_BUSY;

	}



	swqe = ehea_get_swqe(pr->qp, &swqe_index);

	memset(swqe, 0, SWQE_HEADER_SIZE);

	atomic_dec(&pr->swqe_avail);
@@ -2325,8 +2319,6 @@ static int ehea_start_xmit(struct sk_buff *skb, struct net_device *dev) 
		}

		spin_unlock_irqrestore(&pr->netif_queue, flags);

	}

	dev->trans_start = jiffies; /* NETIF_F_LLTX driver :( */

	spin_unlock(&pr->xmit_lock);



	return NETDEV_TX_OK;

}
@@ -3233,7 +3225,7 @@ struct ehea_port *ehea_setup_single_port(struct ehea_adapter *adapter, 
	dev->features = NETIF_F_SG | NETIF_F_FRAGLIST | NETIF_F_TSO

		      | NETIF_F_HIGHDMA | NETIF_F_IP_CSUM | NETIF_F_HW_VLAN_TX

		      | NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_FILTER

		      | NETIF_F_LLTX | NETIF_F_RXCSUM;

		      | NETIF_F_RXCSUM;

	dev->watchdog_timeo = EHEA_WATCH_DOG_TIMEOUT;



	if (use_lro)