diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 14:59:59 +0200 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-07-31 14:59:59 +0200 |
commit | b1b934d31d8a608fe69fc56d6e539548b55b0601 (patch) | |
tree | e8206589759c732a3a9b70b3feeb9ef50dc3c6b3 /net/irda/irlan/irlan_provider.c | |
parent | [GFS2] Fix bug in clear_inode (diff) | |
parent | Linux v2.6.18-rc3 (diff) | |
download | linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.tar.xz linux-b1b934d31d8a608fe69fc56d6e539548b55b0601.zip |
Merge branch 'master'
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; |