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

Commit 58c8c0c0 authored by Brian King's avatar Brian King Committed by David S. Miller
Browse files

ibmvnic: Fixup atomic API usage 



Replace a couple of modifications of an atomic followed
by a read of the atomic, which is no longer atomic, to
use atomic_XX_return variants to avoid race conditions.

Signed-off-by: default avatarBrian King <brking@linux.vnet.ibm.com>
Signed-off-by: default avatarNathan Fontenot <nfont@linux.vnet.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 59af56c2

drivers/net/ethernet/ibm/ibmvnic.c

+4 −6
Original line number Diff line number Diff line
@@ -962,9 +962,8 @@ static int ibmvnic_xmit(struct sk_buff *skb, struct net_device *netdev) 
		goto out;

	}



	atomic_inc(&tx_scrq->used);



	if (atomic_read(&tx_scrq->used) >= adapter->req_tx_entries_per_subcrq) {

	if (atomic_inc_return(&tx_scrq->used)

					>= adapter->req_tx_entries_per_subcrq) {

		netdev_info(netdev, "Stopping queue %d\n", queue_num);

		netif_stop_subqueue(netdev, queue_num);

	}
@@ -1499,9 +1498,8 @@ static int ibmvnic_complete_tx(struct ibmvnic_adapter *adapter, 
			}



			if (txbuff->last_frag) {

				atomic_dec(&scrq->used);



				if (atomic_read(&scrq->used) <=

				if (atomic_sub_return(next->tx_comp.num_comps,

						      &scrq->used) <=

				    (adapter->req_tx_entries_per_subcrq / 2) &&

				    netif_subqueue_stopped(adapter->netdev,

							   txbuff->skb)) {