X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Firda%2Firiap.c;h=2d2e2b1919f40f70230c1527edbf8bb0c23d5fa4;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=61128aa05b4015c9fb85027bd1cc870b34a9beec;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/irda/iriap.c b/net/irda/iriap.c
index 61128aa05..2d2e2b191 100644
--- a/net/irda/iriap.c
+++ b/net/irda/iriap.c
@@ -24,6 +24,7 @@
  *
  ********************************************************************/
 
+#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/types.h>
 #include <linux/skbuff.h>
@@ -345,7 +346,7 @@ static void iriap_disconnect_request(struct iriap_cb *self)
 	IRDA_ASSERT(self != NULL, return;);
 	IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
-	tx_skb = alloc_skb(64, GFP_ATOMIC);
+	tx_skb = dev_alloc_skb(64);
 	if (tx_skb == NULL) {
 		IRDA_DEBUG(0, "%s(), Could not allocate an sk_buff of length %d\n", 
 			__FUNCTION__, 64);
@@ -396,7 +397,7 @@ int iriap_getvaluebyclass_request(struct iriap_cb *self,
 	attr_len = strlen(attr);	/* Up to IAS_MAX_ATTRIBNAME = 60 */
 
 	skb_len = self->max_header_size+2+name_len+1+attr_len+4;
-	tx_skb = alloc_skb(skb_len, GFP_ATOMIC);
+	tx_skb = dev_alloc_skb(skb_len);
 	if (!tx_skb)
 		return -ENOMEM;
 
@@ -562,8 +563,7 @@ static void iriap_getvaluebyclass_response(struct iriap_cb *self,
 	 *  value. We add 32 bytes because of the 6 bytes for the frame and
 	 *  max 5 bytes for the value coding.
 	 */
-	tx_skb = alloc_skb(value->len + self->max_header_size + 32,
-			   GFP_ATOMIC);
+	tx_skb = dev_alloc_skb(value->len + self->max_header_size + 32);
 	if (!tx_skb)
 		return;
 
@@ -701,7 +701,7 @@ void iriap_send_ack(struct iriap_cb *self)
 	IRDA_ASSERT(self != NULL, return;);
 	IRDA_ASSERT(self->magic == IAS_MAGIC, return;);
 
-	tx_skb = alloc_skb(64, GFP_ATOMIC);
+	tx_skb = dev_alloc_skb(64);
 	if (!tx_skb)
 		return;