projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetoot...
[cascardo/linux.git]
/
drivers
/
net
/
wireless
/
marvell
/
mwifiex
/
11n_rxreorder.c
diff --git
a/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
b/drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
index
9448012
..
274dd5a
100644
(file)
--- a/
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
+++ b/
drivers/net/wireless/marvell/mwifiex/11n_rxreorder.c
@@
-45,7
+45,7
@@
static int mwifiex_11n_dispatch_amsdu_pkt(struct mwifiex_private *priv,
skb_trim(skb, le16_to_cpu(local_rx_pd->rx_pkt_length));
ieee80211_amsdu_to_8023s(skb, &list, priv->curr_addr,
- priv->wdev.iftype, 0,
false
);
+ priv->wdev.iftype, 0,
NULL, NULL
);
while (!skb_queue_empty(&list)) {
struct rx_packet_hdr *rx_hdr;