diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-30 15:47:57 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-30 15:47:57 -0500 |
| commit | aacafba8c2f4e9c9f3f38c60be83b65e69866723 (patch) | |
| tree | 1695a295b9ebcd1eb96c84a3d549a69b10e0e50a /drivers/net/ethernet | |
| parent | a46621a3a8f24557201a7ef62de151c812f8985c (diff) | |
| parent | 06e63c57acbb1df7c35ebe846ae416a8b88dfafa (diff) | |
| download | blackbird-op-linux-aacafba8c2f4e9c9f3f38c60be83b65e69866723.tar.gz blackbird-op-linux-aacafba8c2f4e9c9f3f38c60be83b65e69866723.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sfc/mtd.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/rx.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c index eff49da458ed..79c192272047 100644 --- a/drivers/net/ethernet/sfc/mtd.c +++ b/drivers/net/ethernet/sfc/mtd.c @@ -10,7 +10,6 @@ #include <linux/bitops.h> #include <linux/module.h> -#undef DEBUG /* <linux/mtd/mtd.h> has its own use for DEBUG */ #include <linux/mtd/mtd.h> #include <linux/delay.h> #include <linux/slab.h> 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) |
