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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
isdn
/
pcbit
/
layer2.c
diff --git
a/drivers/isdn/pcbit/layer2.c
b/drivers/isdn/pcbit/layer2.c
index
ba76693
..
eafcce5
100644
(file)
--- a/
drivers/isdn/pcbit/layer2.c
+++ b/
drivers/isdn/pcbit/layer2.c
@@
-67,7
+67,6
@@
extern void pcbit_l3_receive(struct pcbit_dev *dev, ulong msg,
* Prototypes
*/
* Prototypes
*/
-void pcbit_deliver(void *data);
static void pcbit_transmit(struct pcbit_dev *dev);
static void pcbit_recv_ack(struct pcbit_dev *dev, unsigned char ack);
static void pcbit_transmit(struct pcbit_dev *dev);
static void pcbit_recv_ack(struct pcbit_dev *dev, unsigned char ack);
@@
-101,7
+100,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);
@@
-299,11
+298,12
@@
pcbit_transmit(struct pcbit_dev *dev)
*/
void
*/
void
-pcbit_deliver(
void *data
)
+pcbit_deliver(
struct work_struct *work
)
{
struct frame_buf *frame;
unsigned long flags, msg;
{
struct frame_buf *frame;
unsigned long flags, msg;
- struct pcbit_dev *dev = (struct pcbit_dev *) data;
+ struct pcbit_dev *dev =
+ container_of(work, struct pcbit_dev, qdelivery);
spin_lock_irqsave(&dev->lock, flags);
spin_lock_irqsave(&dev->lock, flags);
@@
-311,6
+311,7
@@
pcbit_deliver(void *data)
dev->read_queue = frame->next;
spin_unlock_irqrestore(&dev->lock, flags);
dev->read_queue = frame->next;
spin_unlock_irqrestore(&dev->lock, flags);
+ msg = 0;
SET_MSG_CPU(msg, 0);
SET_MSG_PROC(msg, 0);
SET_MSG_CMD(msg, frame->skb->data[2]);
SET_MSG_CPU(msg, 0);
SET_MSG_PROC(msg, 0);
SET_MSG_CMD(msg, frame->skb->data[2]);
@@
-368,13
+369,12
@@
pcbit_receive(struct pcbit_dev *dev)
kfree(dev->read_frame);
dev->read_frame = NULL;
}
kfree(dev->read_frame);
dev->read_frame = NULL;
}
- frame = k
m
alloc(sizeof(struct frame_buf), GFP_ATOMIC);
+ frame = k
z
alloc(sizeof(struct frame_buf), GFP_ATOMIC);
if (frame == NULL) {
printk(KERN_WARNING "kmalloc failed\n");
return;
}
if (frame == NULL) {
printk(KERN_WARNING "kmalloc failed\n");
return;
}
- memset(frame, 0, sizeof(struct frame_buf));
cpu = pcbit_readb(dev);
proc = pcbit_readb(dev);
cpu = pcbit_readb(dev);
proc = pcbit_readb(dev);
@@
-512,7
+512,7
@@
pcbit_firmware_bug(struct pcbit_dev *dev)
}
irqreturn_t
}
irqreturn_t
-pcbit_irq_handler(int interrupt, void *devptr
, struct pt_regs *regs
)
+pcbit_irq_handler(int interrupt, void *devptr)
{
struct pcbit_dev *dev;
u_char info,
{
struct pcbit_dev *dev;
u_char info,