From e95813a1136ea92a38c234fd49d7d80fcc565a57 Mon Sep 17 00:00:00 2001 From: Christian Lamparter Date: Wed, 13 Aug 2008 23:41:48 +0200 Subject: [PATCH] --- yaml --- r: 108835 b: refs/heads/master c: d47c3cebf5aae9d72b2cc18e5ac3b520fdbb0bca h: refs/heads/master i: 108833: 7c8b3d5c4aa489b14bc48a428b66fb96146a8f6a 108831: fcc2fef67b978ebe965b4d4b21a345630f883e3b v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/p54/p54usb.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 8ea4aab84de1..9750de5c7910 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69bbc7dc9f59fedb6067c7f9f9f9bc1da27407ad +refs/heads/master: d47c3cebf5aae9d72b2cc18e5ac3b520fdbb0bca diff --git a/trunk/drivers/net/wireless/p54/p54usb.c b/trunk/drivers/net/wireless/p54/p54usb.c index 815c095ef797..cbaca23a9453 100644 --- a/trunk/drivers/net/wireless/p54/p54usb.c +++ b/trunk/drivers/net/wireless/p54/p54usb.c @@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) urb->context = skb; skb_queue_tail(&priv->rx_queue, skb); } else { + if (!priv->hw_type) + skb_push(skb, sizeof(struct net2280_tx_hdr)); + + skb_reset_tail_pointer(skb); skb_trim(skb, 0); + if (urb->transfer_buffer != skb_tail_pointer(skb)) { + /* this should not happen */ + WARN_ON(1); + urb->transfer_buffer = skb_tail_pointer(skb); + } + skb_queue_tail(&priv->rx_queue, skb); }