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

Commit c3a8c5b6 authored by Divy Le Ray's avatar Divy Le Ray Committed by David S. Miller
Browse files

cxgb3: move away from LLTX 



cxgb3 no longer advertizes LLTX.

Signed-off-by: default avatarDivy Le Ray <divy@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 080c8255

drivers/net/cxgb3/cxgb3_main.c

+0 −1
Original line number Diff line number Diff line
@@ -3059,7 +3059,6 @@ static int __devinit init_one(struct pci_dev *pdev, 
		netdev->mem_start = mmio_start;

		netdev->mem_end = mmio_start + mmio_len - 1;

		netdev->features |= NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;

		netdev->features |= NETIF_F_LLTX;

		netdev->features |= NETIF_F_GRO;

		if (pci_using_dac)

			netdev->features |= NETIF_F_HIGHDMA;

drivers/net/cxgb3/sge.c

+7 −10
Original line number Diff line number Diff line
@@ -1241,7 +1241,6 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	q = &qs->txq[TXQ_ETH];

	txq = netdev_get_tx_queue(dev, qidx);



	spin_lock(&q->lock);

	reclaim_completed_tx(adap, q, TX_RECLAIM_CHUNK);



	credits = q->size - q->in_use;
@@ -1252,7 +1251,6 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
		dev_err(&adap->pdev->dev,

			"%s: Tx ring %u full while queue awake!\n",

			dev->name, q->cntxt_id & 7);

		spin_unlock(&q->lock);

		return NETDEV_TX_BUSY;

	}
@@ -1286,8 +1284,6 @@ int t3_eth_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (vlan_tx_tag_present(skb) && pi->vlan_grp)

		qs->port_stats[SGE_PSTAT_VLANINS]++;



	spin_unlock(&q->lock);



	/*

	 * We do not use Tx completion interrupts to free DMAd Tx packets.

	 * This is good for performamce but means that we rely on new Tx
@@ -2857,11 +2853,12 @@ static void sge_timer_tx(unsigned long data) 
	unsigned int tbd[SGE_TXQ_PER_SET] = {0, 0};

	unsigned long next_period;



	if (spin_trylock(&qs->txq[TXQ_ETH].lock)) {

	if (__netif_tx_trylock(qs->tx_q)) {

                tbd[TXQ_ETH] = reclaim_completed_tx(adap, &qs->txq[TXQ_ETH],

                                                     TX_RECLAIM_TIMER_CHUNK);

		spin_unlock(&qs->txq[TXQ_ETH].lock);

		__netif_tx_unlock(qs->tx_q);

	}



	if (spin_trylock(&qs->txq[TXQ_OFLD].lock)) {

		tbd[TXQ_OFLD] = reclaim_completed_tx(adap, &qs->txq[TXQ_OFLD],

						     TX_RECLAIM_TIMER_CHUNK);