diff --git a/[refs] b/[refs]
index 3c058703f27c..1b92b209f9d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b1c36b357153f491ddea5363fdd397109c3326f
+refs/heads/master: 06e63c57acbb1df7c35ebe846ae416a8b88dfafa
diff --git a/trunk/drivers/net/ethernet/sfc/rx.c b/trunk/drivers/net/ethernet/sfc/rx.c
index a33aef25ead9..1dfda5e27919 100644
--- a/trunk/drivers/net/ethernet/sfc/rx.c
+++ b/trunk/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)