diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 23:30:38 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 23:30:38 +0100 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /net/irda/iriap_event.c | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/irda/iriap_event.c')
| -rw-r--r-- | net/irda/iriap_event.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/iriap_event.c b/net/irda/iriap_event.c index a73607450de1..da17395df05a 100644 --- a/net/irda/iriap_event.c +++ b/net/irda/iriap_event.c @@ -365,7 +365,7 @@ static void state_r_disconnect(struct iriap_cb *self, IRIAP_EVENT event, switch (event) { case IAP_LM_CONNECT_INDICATION: - tx_skb = dev_alloc_skb(64); + tx_skb = alloc_skb(64, GFP_ATOMIC); if (tx_skb == NULL) { IRDA_WARNING("%s: unable to malloc!\n", __FUNCTION__); return; |