diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2012-01-30 16:55:05 +0000 |
|---|---|---|
| committer | Ben Hutchings <bhutchings@solarflare.com> | 2012-01-30 16:58:45 +0000 |
| commit | 06e63c57acbb1df7c35ebe846ae416a8b88dfafa (patch) | |
| tree | 8f94c0c1d4c2347dc0dc5099440d3dc3b19e203f /drivers | |
| parent | sfc: MTD: Leave the DEBUG macro alone (diff) | |
| download | linux-dev-06e63c57acbb1df7c35ebe846ae416a8b88dfafa.tar.xz linux-dev-06e63c57acbb1df7c35ebe846ae416a8b88dfafa.zip | |
sfc: Use a more sensible cast in efx_rx_buf_offset()
This function returns the page offset of the buffer, which can be
calculated based on either its DMA address or its virtual address. It
used to use the virtual address and we would cast that to unsigned
long, as anything smaller would result in a compiler warning. Now
that it's using the DMA address we should use unsigned int, matching
the return type. It is also unnecessary to use __force.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/rx.c b/drivers/net/ethernet/sfc/rx.c index a33aef25ead9..1dfda5e27919 100644 --- a/drivers/net/ethernet/sfc/rx.c +++ b/drivers/net/ethernet/sfc/rx.c @@ -98,7 +98,7 @@ static inline unsigned int efx_rx_buf_offset(struct efx_nic *efx, /* Offset is always within one page, so we don't need to consider * the page order. */ - return ((__force unsigned long) buf->dma_addr & (PAGE_SIZE - 1)) + + return ((unsigned int) buf->dma_addr & (PAGE_SIZE - 1)) + efx->type->rx_buffer_hash_size; } static inline unsigned int efx_rx_buf_size(struct efx_nic *efx) |