diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2013-03-07 20:20:02 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2013-03-07 20:21:30 +0000 |
| commit | 86c2da58a70e02ece910a3bba3da86d61b6aeefd (patch) | |
| tree | 79d074c9f601142a5b3290ddc8973a9855bdff37 | |
| parent | 6906f4ed6f85b2d72fd944e15da6a905fdde8b40 (diff) | |
| parent | c73e787a8db9117d59b5180baf83203a42ecadca (diff) | |
| download | lwn-86c2da58a70e02ece910a3bba3da86d61b6aeefd.tar.gz lwn-86c2da58a70e02ece910a3bba3da86d61b6aeefd.zip | |
Merge branch 'sfc-3.9' into master
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.h | 4 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/efx.h b/drivers/net/ethernet/sfc/efx.h index 50247dfe8f57..d2f790df6dcb 100644 --- a/drivers/net/ethernet/sfc/efx.h +++ b/drivers/net/ethernet/sfc/efx.h @@ -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 */ diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index 879ff5849bbd..bb579a6128c8 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c @@ -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; |