dect/linux-2.6
Archived
14
0
Fork 0
Code Releases Activity

Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next

Browse source
This commit is contained in:
David S. Miller 2012-01-30 15:47:57 -05:00
commit aacafba8c2
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/net/ethernet/sfc/mtd.c
View file

@ -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>

2
drivers/net/ethernet/sfc/rx.c
View file

@ -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)