diff options
author | David Woodhouse | 2006-08-31 00:30:38 +0200 |
---|---|---|
committer | David Woodhouse | 2006-08-31 00:30:38 +0200 |
commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /net/irda/irlan/irlan_provider.c | |
parent | MTD: Add lock/unlock operations for Atmel AT49BV6416 (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6 (diff) | |
download | kernel-qcow2-linux-0a7d5f8ce960e74fa22986bda4af488539796e49.tar.gz kernel-qcow2-linux-0a7d5f8ce960e74fa22986bda4af488539796e49.tar.xz kernel-qcow2-linux-0a7d5f8ce960e74fa22986bda4af488539796e49.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/irda/irlan/irlan_provider.c')
-rw-r--r-- | net/irda/irlan/irlan_provider.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irlan/irlan_provider.c b/net/irda/irlan/irlan_provider.c index 39c202d1c374..9c0df86044d7 100644 --- a/net/irda/irlan/irlan_provider.c +++ b/net/irda/irlan/irlan_provider.c @@ -296,7 +296,7 @@ void irlan_provider_send_reply(struct irlan_cb *self, int command, IRDA_ASSERT(self != NULL, return;); IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;); - skb = dev_alloc_skb(128); + skb = alloc_skb(128, GFP_ATOMIC); if (!skb) return; |