projects
/
linux
/ 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]
/
drivers
/
net
/
wireless
/
iwlwifi
/
mvm
/
ops.c
diff --git
a/drivers/net/wireless/iwlwifi/mvm/ops.c
b/drivers/net/wireless/iwlwifi/mvm/ops.c
index
5d577c1
..
e7f6c01
100644
(file)
--- a/
drivers/net/wireless/iwlwifi/mvm/ops.c
+++ b/
drivers/net/wireless/iwlwifi/mvm/ops.c
@@
-1329,7
+1329,8
@@
static void iwl_mvm_napi_add(struct iwl_op_mode *op_mode,
{
struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
{
struct iwl_mvm *mvm = IWL_OP_MODE_GET_MVM(op_mode);
- ieee80211_napi_add(mvm->hw, napi, napi_dev, poll, weight);
+ netif_napi_add(napi_dev, napi, poll, weight);
+ mvm->napi = napi;
}
static const struct iwl_op_mode_ops iwl_mvm_ops = {
}
static const struct iwl_op_mode_ops iwl_mvm_ops = {