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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
bluetooth
/
bfusb.c
diff --git
a/drivers/bluetooth/bfusb.c
b/drivers/bluetooth/bfusb.c
index
c42d7e6
..
8947c88
100644
(file)
--- a/
drivers/bluetooth/bfusb.c
+++ b/
drivers/bluetooth/bfusb.c
@@
-158,7
+158,7
@@
static int bfusb_send_bulk(struct bfusb *bfusb, struct sk_buff *skb)
if (err) {
BT_ERR("%s bulk tx submit failed urb %p err %d",
bfusb->hdev->name, urb, err);
if (err) {
BT_ERR("%s bulk tx submit failed urb %p err %d",
bfusb->hdev->name, urb, err);
- skb_unlink(skb);
+ skb_unlink(skb
, &bfusb->pending_q
);
usb_free_urb(urb);
} else
atomic_inc(&bfusb->pending_tx);
usb_free_urb(urb);
} else
atomic_inc(&bfusb->pending_tx);
@@
-212,7
+212,7
@@
static void bfusb_tx_complete(struct urb *urb, struct pt_regs *regs)
read_lock(&bfusb->lock);
read_lock(&bfusb->lock);
- skb_unlink(skb);
+ skb_unlink(skb
, &bfusb->pending_q
);
skb_queue_tail(&bfusb->completed_q, skb);
bfusb_tx_wakeup(bfusb);
skb_queue_tail(&bfusb->completed_q, skb);
bfusb_tx_wakeup(bfusb);
@@
-253,7
+253,7
@@
static int bfusb_rx_submit(struct bfusb *bfusb, struct urb *urb)
if (err) {
BT_ERR("%s bulk rx submit failed urb %p err %d",
bfusb->hdev->name, urb, err);
if (err) {
BT_ERR("%s bulk rx submit failed urb %p err %d",
bfusb->hdev->name, urb, err);
- skb_unlink(skb);
+ skb_unlink(skb
, &bfusb->pending_q
);
kfree_skb(skb);
usb_free_urb(urb);
}
kfree_skb(skb);
usb_free_urb(urb);
}
@@
-330,7
+330,7
@@
static inline int bfusb_recv_block(struct bfusb *bfusb, int hdr, unsigned char *
}
skb->dev = (void *) bfusb->hdev;
}
skb->dev = (void *) bfusb->hdev;
-
skb
->pkt_type = pkt_type;
+
bt_cb(skb)
->pkt_type = pkt_type;
bfusb->reassembly = skb;
} else {
bfusb->reassembly = skb;
} else {
@@
-398,7
+398,7
@@
static void bfusb_rx_complete(struct urb *urb, struct pt_regs *regs)
buf += len;
}
buf += len;
}
- skb_unlink(skb);
+ skb_unlink(skb
, &bfusb->pending_q
);
kfree_skb(skb);
bfusb_rx_submit(bfusb, urb);
kfree_skb(skb);
bfusb_rx_submit(bfusb, urb);
@@
-485,7
+485,7
@@
static int bfusb_send_frame(struct sk_buff *skb)
unsigned char buf[3];
int sent = 0, size, count;
unsigned char buf[3];
int sent = 0, size, count;
- BT_DBG("hdev %p skb %p type %d len %d", hdev, skb,
skb
->pkt_type, skb->len);
+ BT_DBG("hdev %p skb %p type %d len %d", hdev, skb,
bt_cb(skb)
->pkt_type, skb->len);
if (!hdev) {
BT_ERR("Frame for unknown HCI device (hdev=NULL)");
if (!hdev) {
BT_ERR("Frame for unknown HCI device (hdev=NULL)");
@@
-497,7
+497,7
@@
static int bfusb_send_frame(struct sk_buff *skb)
bfusb = (struct bfusb *) hdev->driver_data;
bfusb = (struct bfusb *) hdev->driver_data;
- switch (
skb
->pkt_type) {
+ switch (
bt_cb(skb)
->pkt_type) {
case HCI_COMMAND_PKT:
hdev->stat.cmd_tx++;
break;
case HCI_COMMAND_PKT:
hdev->stat.cmd_tx++;
break;
@@
-510,7
+510,7
@@
static int bfusb_send_frame(struct sk_buff *skb)
};
/* Prepend skb with frame type */
};
/* Prepend skb with frame type */
- memcpy(skb_push(skb, 1), &
(skb->pkt_type)
, 1);
+ memcpy(skb_push(skb, 1), &
bt_cb(skb)->pkt_type
, 1);
count = skb->len;
count = skb->len;
@@
-673,13
+673,11
@@
static int bfusb_probe(struct usb_interface *intf, const struct usb_device_id *i
}
/* Initialize control structure and load firmware */
}
/* Initialize control structure and load firmware */
- if (!(bfusb = k
m
alloc(sizeof(struct bfusb), GFP_KERNEL))) {
+ if (!(bfusb = k
z
alloc(sizeof(struct bfusb), GFP_KERNEL))) {
BT_ERR("Can't allocate memory for control structure");
goto done;
}
BT_ERR("Can't allocate memory for control structure");
goto done;
}
- memset(bfusb, 0, sizeof(struct bfusb));
-
bfusb->udev = udev;
bfusb->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress;
bfusb->bulk_out_ep = bulk_out_ep->desc.bEndpointAddress;
bfusb->udev = udev;
bfusb->bulk_in_ep = bulk_in_ep->desc.bEndpointAddress;
bfusb->bulk_out_ep = bulk_out_ep->desc.bEndpointAddress;
@@
-770,7
+768,6
@@
static void bfusb_disconnect(struct usb_interface *intf)
}
static struct usb_driver bfusb_driver = {
}
static struct usb_driver bfusb_driver = {
- .owner = THIS_MODULE,
.name = "bfusb",
.probe = bfusb_probe,
.disconnect = bfusb_disconnect,
.name = "bfusb",
.probe = bfusb_probe,
.disconnect = bfusb_disconnect,