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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
irda
/
af_irda.c
diff --git
a/net/irda/af_irda.c
b/net/irda/af_irda.c
index
2f37c9f
..
17699ee
100644
(file)
--- a/
net/irda/af_irda.c
+++ b/
net/irda/af_irda.c
@@
-42,7
+42,6
@@
*
********************************************************************/
*
********************************************************************/
-#include <linux/config.h>
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/capability.h>
#include <linux/module.h>
#include <linux/types.h>
@@
-309,7
+308,7
@@
static void irda_connect_response(struct irda_sock *self)
IRDA_ASSERT(self != NULL, return;);
IRDA_ASSERT(self != NULL, return;);
- skb =
dev_alloc_skb(64
);
+ skb =
alloc_skb(64, GFP_ATOMIC
);
if (skb == NULL) {
IRDA_DEBUG(0, "%s() Unable to allocate sk_buff!\n",
__FUNCTION__);
if (skb == NULL) {
IRDA_DEBUG(0, "%s() Unable to allocate sk_buff!\n",
__FUNCTION__);