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

Commit b2d56536 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: simplify swap in clean_rx_irq if using packet split 



This update replaces the xchg calls that were added with a pair of
assignments as there is no need for the xchg calls and they were found to
cause issues on some architectures.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ef6b235

drivers/net/igb/igb_main.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -3926,8 +3926,10 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring, 
		next_buffer = &rx_ring->buffer_info[i];

		next_buffer = &rx_ring->buffer_info[i];





		if (!(staterr & E1000_RXD_STAT_EOP)) {

		if (!(staterr & E1000_RXD_STAT_EOP)) {

			buffer_info->skb = xchg(&next_buffer->skb, skb);

			buffer_info->skb = next_buffer->skb;

			buffer_info->dma = xchg(&next_buffer->dma, 0);

			buffer_info->dma = next_buffer->dma;

			next_buffer->skb = skb;

			next_buffer->dma = 0;

			goto next_desc;

			goto next_desc;

		}

		}