git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
irda
/
iriap.c
diff --git
a/net/irda/iriap.c
b/net/irda/iriap.c
index
61128aa
..
2d2e2b1
100644
(file)
--- 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>
#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;);
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);
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;
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;
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.
*/
* 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;
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;);
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;
if (!tx_skb)
return;