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

Commit 70e21fe4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sfc-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc 



Ben Hutchings says:

====================
Fix regressions introduced by the last set of fixes (sorry):

1. Potential deadlock when disabling TX queues.
2. RX was broken on architectures other than x86 and powerpc.

I still expect to send one more bug fix for 3.9, but as it sometimes
takes days to reproduce the bug it's going to take a couple of weeks of
testing to be confident that it's really fixed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 66d29cbc c73e787a

drivers/net/ethernet/sfc/efx.h

+2 −2
Original line number Diff line number Diff line
@@ -171,9 +171,9 @@ static inline void efx_device_detach_sync(struct efx_nic *efx) 
	 * TX scheduler is stopped when we're done and before

	 * netif_device_present() becomes false.

	 */

	netif_tx_lock(dev);

	netif_tx_lock_bh(dev);

	netif_device_detach(dev);

	netif_tx_unlock(dev);

	netif_tx_unlock_bh(dev);

}



#endif /* EFX_EFX_H */

drivers/net/ethernet/sfc/rx.c

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue) 
		rx_buf = efx_rx_buffer(rx_queue, index);

		rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;

		rx_buf->u.page = page;

		rx_buf->page_offset = page_offset;

		rx_buf->page_offset = page_offset + EFX_PAGE_IP_ALIGN;

		rx_buf->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;

		rx_buf->flags = EFX_RX_BUF_PAGE;

		++rx_queue->added_count;