git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'hwmon-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
isdn
/
pcbit
/
layer2.c
diff --git
a/drivers/isdn/pcbit/layer2.c
b/drivers/isdn/pcbit/layer2.c
index
6ff8557
..
5ba2a87
100644
(file)
--- a/
drivers/isdn/pcbit/layer2.c
+++ b/
drivers/isdn/pcbit/layer2.c
@@
-24,7
+24,6
@@
* re-write/remove debug printks
*/
* re-write/remove debug printks
*/
-#include <linux/sched.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-47,22
+46,6
@@
#undef DEBUG_FRAG
#undef DEBUG_FRAG
-
-/*
- * task queue struct
- */
-
-
-
-/*
- * Layer 3 packet demultiplexer
- * drv.c
- */
-
-extern void pcbit_l3_receive(struct pcbit_dev *dev, ulong msg,
- struct sk_buff *skb,
- ushort hdr_len, ushort refnum);
-
/*
* Prototypes
*/
/*
* Prototypes
*/
@@
-100,7
+83,7
@@
pcbit_l2_write(struct pcbit_dev *dev, ulong msg, ushort refnum,
dev_kfree_skb(skb);
return -1;
}
dev_kfree_skb(skb);
return -1;
}
- if ((frame =
(struct frame_buf *)
kmalloc(sizeof(struct frame_buf),
+ if ((frame = kmalloc(sizeof(struct frame_buf),
GFP_ATOMIC)) == NULL) {
printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");
dev_kfree_skb(skb);
GFP_ATOMIC)) == NULL) {
printk(KERN_WARNING "pcbit_2_write: kmalloc failed\n");
dev_kfree_skb(skb);