git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1...
[pandora-kernel.git]
/
drivers
/
net
/
wireless
/
wl1251
/
rx.c
diff --git
a/drivers/net/wireless/wl1251/rx.c
b/drivers/net/wireless/wl1251/rx.c
index
c1b3b3f
..
6af3526
100644
(file)
--- a/
drivers/net/wireless/wl1251/rx.c
+++ b/
drivers/net/wireless/wl1251/rx.c
@@
-179,7
+179,7
@@
static void wl1251_rx_body(struct wl1251 *wl,
rx_buffer = skb_put(skb, length);
wl1251_mem_read(wl, rx_packet_ring_addr, rx_buffer, length);
rx_buffer = skb_put(skb, length);
wl1251_mem_read(wl, rx_packet_ring_addr, rx_buffer, length);
- /* The actual leng
ht
doesn't include the target's alignment */
+ /* The actual leng
th
doesn't include the target's alignment */
skb->len = desc->length - PLCP_HEADER_LENGTH;
fc = (u16 *)skb->data;
skb->len = desc->length - PLCP_HEADER_LENGTH;
fc = (u16 *)skb->data;