summaryrefslogtreecommitdiffstats
path: root/drivers/ieee1394/eth1394.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2005-10-21 09:22:34 +0200
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-28 17:16:51 +0200
commitb4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca (patch)
tree51c609f9a954cd5d4732c4b512f9ff2e19546d47 /drivers/ieee1394/eth1394.c
parent[PATCH] gfp_t: drivers/net (diff)
downloadlinux-b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca.tar.xz
linux-b4e3ca1ab1ae9ae86134126dcdc88da1caaa32ca.zip
[PATCH] gfp_t: remaining bits of drivers/*
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ieee1394/eth1394.c')
-rw-r--r--drivers/ieee1394/eth1394.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
index 4802bbbb6dc9..c9e92d85c893 100644
--- a/drivers/ieee1394/eth1394.c
+++ b/drivers/ieee1394/eth1394.c
@@ -1630,7 +1630,7 @@ static void ether1394_complete_cb(void *__ptask)
/* Transmit a packet (called by kernel) */
static int ether1394_tx (struct sk_buff *skb, struct net_device *dev)
{
- int kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
+ gfp_t kmflags = in_interrupt() ? GFP_ATOMIC : GFP_KERNEL;
struct eth1394hdr *eth;
struct eth1394_priv *priv = netdev_priv(dev);
int proto;