diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 04:01:29 -0800 |
| commit | f7f65d1e8bfaa92c1a419c2a52faeca835659295 (patch) | |
| tree | b616a113bddb2728fca89ef3062c16b220cee620 /drivers/net/wireless/libertas_tf/if_usb.c | |
| parent | eafdcb433f854c8cb06747a80fa3df7c72147be6 (diff) | |
| parent | 4018517a1a69a85c3d61b20fa02f187b80773137 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'drivers/net/wireless/libertas_tf/if_usb.c')
| -rw-r--r-- | drivers/net/wireless/libertas_tf/if_usb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas_tf/if_usb.c b/drivers/net/wireless/libertas_tf/if_usb.c index 1cc03a8dd67..59634c33b1f 100644 --- a/drivers/net/wireless/libertas_tf/if_usb.c +++ b/drivers/net/wireless/libertas_tf/if_usb.c @@ -331,7 +331,7 @@ static int __if_usb_submit_rx_urb(struct if_usb_card *cardp, /* Fill the receive configuration URB and initialise the Rx call back */ usb_fill_bulk_urb(cardp->rx_urb, cardp->udev, usb_rcvbulkpipe(cardp->udev, cardp->ep_in), - (void *) (skb->tail), + skb_tail_pointer(skb), MRVDRV_ETH_RX_PACKET_BUFFER_SIZE, callbackfn, cardp); cardp->rx_urb->transfer_flags |= URB_ZERO_PACKET; |