projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'mac80211-next-for-davem-2015-08-14' into next
[linux-2.6-microblaze.git]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
rx.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/rx.c
b/drivers/net/wireless/iwlwifi/mvm/rx.c
index
6574614
..
a0c27cc
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/rx.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/rx.c
@@
-127,7
+127,7
@@
static void iwl_mvm_pass_packet_to_mac80211(struct iwl_mvm *mvm,
fraglen, rxb->truesize);
}
- ieee80211_rx
(mvm->hw, skb
);
+ ieee80211_rx
_napi(mvm->hw, skb, mvm->napi
);
}
/*