summaryrefslogtreecommitdiffstats
path: root/net/irda
diff options
context:
space:
mode:
authorMathias Krause <minipli@googlemail.com>2013-04-05 10:41:27 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-08 12:09:17 -0400
commit84e2306e94549acd19e5d19734ddff3c2847e032 (patch)
tree7b08d0c07bab99c18ad63657984879d860cf614b /net/irda
parent22251c73ca63b5b1050724be9b54910c101a5f30 (diff)
downloadlinux-84e2306e94549acd19e5d19734ddff3c2847e032.tar.gz
linux-84e2306e94549acd19e5d19734ddff3c2847e032.tar.bz2
linux-84e2306e94549acd19e5d19734ddff3c2847e032.zip
irda: use GFP_KERNEL in irda_create()
irda_create() is called from user context only, therefore has no need for GFP_ATOMIC. Signed-off-by: Mathias Krause <minipli@googlemail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/irda')
-rw-r--r--net/irda/af_irda.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/af_irda.c b/net/irda/af_irda.c
index e493b3397ae3..1c2dc90fbaaf 100644
--- a/net/irda/af_irda.c
+++ b/net/irda/af_irda.c
@@ -1120,7 +1120,7 @@ static int irda_create(struct net *net, struct socket *sock, int protocol,
}
/* Allocate networking socket */
- sk = sk_alloc(net, PF_IRDA, GFP_ATOMIC, &irda_proto);
+ sk = sk_alloc(net, PF_IRDA, GFP_KERNEL, &irda_proto);
if (sk == NULL)
return -ENOMEM;