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
/
irlan
/
irlan_common.c
diff --git
a/net/irda/irlan/irlan_common.c
b/net/irda/irlan/irlan_common.c
index
7dd0a2f
..
657d122
100644
(file)
--- a/
net/irda/irlan/irlan_common.c
+++ b/
net/irda/irlan/irlan_common.c
@@
-23,6
+23,7
@@
*
********************************************************************/
*
********************************************************************/
+#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-636,7
+637,7
@@
void irlan_get_provider_info(struct irlan_cb *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(64, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(64
);
if (!skb)
return;
if (!skb)
return;
@@
-668,7
+669,7
@@
void irlan_open_data_channel(struct irlan_cb *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(64, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(64
);
if (!skb)
return;
if (!skb)
return;
@@
-704,7
+705,7
@@
void irlan_close_data_channel(struct irlan_cb *self)
if (self->client.tsap_ctrl == NULL)
return;
if (self->client.tsap_ctrl == NULL)
return;
- skb =
alloc_skb(64, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(64
);
if (!skb)
return;
if (!skb)
return;
@@
-739,7
+740,7
@@
static void irlan_open_unicast_addr(struct irlan_cb *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(128, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(128
);
if (!skb)
return;
if (!skb)
return;
@@
-777,7
+778,7
@@
void irlan_set_broadcast_filter(struct irlan_cb *self, int status)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(128, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(128
);
if (!skb)
return;
if (!skb)
return;
@@
-816,7
+817,7
@@
void irlan_set_multicast_filter(struct irlan_cb *self, int status)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(128, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(128
);
if (!skb)
return;
if (!skb)
return;
@@
-856,7
+857,7
@@
static void irlan_get_unicast_addr(struct irlan_cb *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(128, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(128
);
if (!skb)
return;
if (!skb)
return;
@@
-891,7
+892,7
@@
void irlan_get_media_char(struct irlan_cb *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self->magic == IRLAN_MAGIC, return;);
- skb =
alloc_skb(64, GFP_ATOMIC
);
+ skb =
dev_alloc_skb(64
);
if (!skb)
return;
if (!skb)
return;