Commit 86c2da58 authored by Ben Hutchings's avatar Ben Hutchings

Merge branch 'sfc-3.9' into master

parents 6906f4ed c73e787a
...@@ -171,9 +171,9 @@ static inline void efx_device_detach_sync(struct efx_nic *efx) ...@@ -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 * TX scheduler is stopped when we're done and before
* netif_device_present() becomes false. * netif_device_present() becomes false.
*/ */
netif_tx_lock(dev); netif_tx_lock_bh(dev);
netif_device_detach(dev); netif_device_detach(dev);
netif_tx_unlock(dev); netif_tx_unlock_bh(dev);
} }
#endif /* EFX_EFX_H */ #endif /* EFX_EFX_H */
...@@ -215,7 +215,7 @@ static int efx_init_rx_buffers_page(struct efx_rx_queue *rx_queue) ...@@ -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 = efx_rx_buffer(rx_queue, index);
rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN; rx_buf->dma_addr = dma_addr + EFX_PAGE_IP_ALIGN;
rx_buf->u.page = page; 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->len = efx->rx_buffer_len - EFX_PAGE_IP_ALIGN;
rx_buf->flags = EFX_RX_BUF_PAGE; rx_buf->flags = EFX_RX_BUF_PAGE;
++rx_queue->added_count; ++rx_queue->added_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment