summaryrefslogtreecommitdiffstats
path: root/drivers/staging/vt6656/usbpipe.c
diff options
context:
space:
mode:
authorMalcolm Priestley2014-06-25 22:14:22 +0200
committerGreg Kroah-Hartman2014-06-27 02:21:19 +0200
commit63b9907f58f1c1b718cd37eeaec074692f00492d (patch)
treed83e3f42c570408dcc5442a488e585404cfb73f9 /drivers/staging/vt6656/usbpipe.c
parentstaging: xillybus: Use devm_ API for memory allocation and DMA mapping (diff)
downloadkernel-qcow2-linux-63b9907f58f1c1b718cd37eeaec074692f00492d.tar.gz
kernel-qcow2-linux-63b9907f58f1c1b718cd37eeaec074692f00492d.tar.xz
kernel-qcow2-linux-63b9907f58f1c1b718cd37eeaec074692f00492d.zip
staging: vt6656: mac80211 conversion: create rx function.
Add mac80211 header and depends. Create new function vnt_rx_data to receive 80211 packets which is based on RXbBulkInProcessData and rx them into mac80211 The function also relays dbm, tsf_time(as mactime) and sets byBBPreEDRSSI and uCurrRSSI. skb is modified slightly to skb_put the maxium tail room in PIPEnsBulkInUsbRead and trim back in vnt_rx_data. dev_alloc_skb is used to reallocate the sk_buff. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vt6656/usbpipe.c')
-rw-r--r--drivers/staging/vt6656/usbpipe.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c
index e4751b71e4d3..e30150efbe43 100644
--- a/drivers/staging/vt6656/usbpipe.c
+++ b/drivers/staging/vt6656/usbpipe.c
@@ -242,7 +242,7 @@ int PIPEnsBulkInUsbRead(struct vnt_private *priv, struct vnt_rcb *rcb)
usb_fill_bulk_urb(urb,
priv->usb,
usb_rcvbulkpipe(priv->usb, 2),
- (void *) (rcb->skb->data),
+ skb_put(rcb->skb, skb_tailroom(rcb->skb)),
MAX_TOTAL_SIZE_WITH_ALL_HEADERS,
s_nsBulkInUsbIoCompleteRead,
rcb);
@@ -297,7 +297,7 @@ static void s_nsBulkInUsbIoCompleteRead(struct urb *urb)
if (urb->actual_length) {
spin_lock_irqsave(&priv->lock, flags);
- if (RXbBulkInProcessData(priv, rcb, urb->actual_length) == true)
+ if (vnt_rx_data(priv, rcb, urb->actual_length))
re_alloc_skb = true;
spin_unlock_irqrestore(&priv->lock, flags);