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

Commit 9e24974d authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: drivers/net 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 53f9fc93

drivers/net/cassini.c

+2 −2
Original line number Diff line number Diff line
@@ -489,7 +489,7 @@ static int cas_page_free(struct cas *cp, cas_page_t *page) 
/* local page allocation routines for the receive buffers. jumbo pages

 * require at least 8K contiguous and 8K aligned buffers.

 */

static cas_page_t *cas_page_alloc(struct cas *cp, const int flags)

static cas_page_t *cas_page_alloc(struct cas *cp, const gfp_t flags)

{

	cas_page_t *page;
@@ -561,7 +561,7 @@ static void cas_spare_free(struct cas *cp) 
}



/* replenish spares if needed */

static void cas_spare_recover(struct cas *cp, const int flags)

static void cas_spare_recover(struct cas *cp, const gfp_t flags)

{

	struct list_head list, *elem, *tmp;

	int needed, i;

drivers/net/lance.c

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ enum {OLD_LANCE = 0, PCNET_ISA=1, PCNET_ISAP=2, PCNET_PCI=3, PCNET_VLB=4, PCNET_ 
static unsigned char lance_need_isa_bounce_buffers = 1;



static int lance_open(struct net_device *dev);

static void lance_init_ring(struct net_device *dev, int mode);

static void lance_init_ring(struct net_device *dev, gfp_t mode);

static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev);

static int lance_rx(struct net_device *dev);

static irqreturn_t lance_interrupt(int irq, void *dev_id, struct pt_regs *regs);
@@ -846,7 +846,7 @@ lance_purge_ring(struct net_device *dev) 


/* Initialize the LANCE Rx and Tx rings. */

static void

lance_init_ring(struct net_device *dev, int gfp)

lance_init_ring(struct net_device *dev, gfp_t gfp)

{

	struct lance_private *lp = dev->priv;

	int i;

drivers/net/myri_sbus.c

+1 −1
Original line number Diff line number Diff line
@@ -277,7 +277,7 @@ static void myri_init_rings(struct myri_eth *mp, int from_irq) 
	struct recvq __iomem *rq = mp->rq;

	struct myri_rxd __iomem *rxd = &rq->myri_rxd[0];

	struct net_device *dev = mp->dev;

	int gfp_flags = GFP_KERNEL;

	gfp_t gfp_flags = GFP_KERNEL;

	int i;



	if (from_irq || in_interrupt())

drivers/net/myri_sbus.h

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ struct myri_eth { 
/* We use this to acquire receive skb's that we can DMA directly into. */

#define ALIGNED_RX_SKB_ADDR(addr) \

        ((((unsigned long)(addr) + (64 - 1)) & ~(64 - 1)) - (unsigned long)(addr))

static inline struct sk_buff *myri_alloc_skb(unsigned int length, int gfp_flags)

static inline struct sk_buff *myri_alloc_skb(unsigned int length, gfp_t gfp_flags)

{

	struct sk_buff *skb;

drivers/net/sunbmac.c

+2 −1
Original line number Diff line number Diff line
@@ -214,7 +214,8 @@ static void bigmac_init_rings(struct bigmac *bp, int from_irq) 
{

	struct bmac_init_block *bb = bp->bmac_block;

	struct net_device *dev = bp->dev;

	int i, gfp_flags = GFP_KERNEL;

	int i;

	gfp_t gfp_flags = GFP_KERNEL;



	if (from_irq || in_interrupt())

		gfp_flags = GFP_ATOMIC;