Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aacafba8 authored by David S. Miller's avatar David S. Miller
Browse files

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

parents a46621a3 06e63c57

drivers/net/ethernet/sfc/mtd.c

+0 −1
Original line number Original line Diff line number Diff line
@@ -10,7 +10,6 @@ 




#include <linux/bitops.h>

#include <linux/bitops.h>

#include <linux/module.h>

#include <linux/module.h>

#undef DEBUG /* <linux/mtd/mtd.h> has its own use for DEBUG */

#include <linux/mtd/mtd.h>

#include <linux/mtd/mtd.h>

#include <linux/delay.h>

#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/slab.h>

drivers/net/ethernet/sfc/rx.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

	/* Offset is always within one page, so we don't need to consider

	 * the page order.

	 * 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;

		efx->type->rx_buffer_hash_size;

}

}

static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)

static inline unsigned int efx_rx_buf_size(struct efx_nic *efx)