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
BUILTIN -> REMOVED : CONFIG_UTRACE
[linux-2.6.git]
/
net
/
irda
/
iriap.c
diff --git
a/net/irda/iriap.c
b/net/irda/iriap.c
index
b8bb78a
..
61128aa
100644
(file)
--- a/
net/irda/iriap.c
+++ b/
net/irda/iriap.c
@@
-24,7
+24,6
@@
*
********************************************************************/
*
********************************************************************/
-#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>
@@
-346,7
+345,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 =
dev_alloc_skb(64
);
+ tx_skb =
alloc_skb(64, GFP_ATOMIC
);
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);
@@
-364,7
+363,7
@@
static void iriap_disconnect_request(struct iriap_cb *self)
/*
* Function iriap_getvaluebyclass (addr, name, attr)
*
/*
* Function iriap_getvaluebyclass (addr, name, attr)
*
- * Retr
ei
ve all values from attribute in all objects with given class
+ * Retr
ie
ve all values from attribute in all objects with given class
* name
*/
int iriap_getvaluebyclass_request(struct iriap_cb *self,
* name
*/
int iriap_getvaluebyclass_request(struct iriap_cb *self,
@@
-397,7
+396,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 =
dev_alloc_skb(skb_len
);
+ tx_skb =
alloc_skb(skb_len, GFP_ATOMIC
);
if (!tx_skb)
return -ENOMEM;
if (!tx_skb)
return -ENOMEM;
@@
-544,7
+543,8
@@
static void iriap_getvaluebyclass_response(struct iriap_cb *self,
{
struct sk_buff *tx_skb;
int n;
{
struct sk_buff *tx_skb;
int n;
- __u32 tmp_be32, tmp_be16;
+ __u32 tmp_be32;
+ __be16 tmp_be16;
__u8 *fp;
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
__u8 *fp;
IRDA_DEBUG(4, "%s()\n", __FUNCTION__);
@@
-562,7
+562,8
@@
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 = dev_alloc_skb(value->len + self->max_header_size + 32);
+ tx_skb = alloc_skb(value->len + self->max_header_size + 32,
+ GFP_ATOMIC);
if (!tx_skb)
return;
if (!tx_skb)
return;
@@
-700,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 =
dev_alloc_skb(64
);
+ tx_skb =
alloc_skb(64, GFP_ATOMIC
);
if (!tx_skb)
return;
if (!tx_skb)
return;