diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 16:38:24 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-11-26 16:38:24 +0200 |
| commit | 4615fd1551334ae5ce8e118a58d697d61f1c7d58 (patch) | |
| tree | 0fb1d9978e9b594b648e4e21c2461b523955b0a1 /drivers/net/wireless/intel/iwlwifi/mvm/sta.h | |
| parent | 6d808eba602b00f77f26191f45328774ff057cc0 (diff) | |
| parent | 9513c5e18a0dc55a1fc9c890715098ba2315830b (diff) | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into next
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mvm/sta.h')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h index eedb215eba3f..0631cc0a6d3c 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.h +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.h @@ -365,8 +365,8 @@ int iwl_mvm_rm_sta_id(struct iwl_mvm *mvm, int iwl_mvm_set_sta_key(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_sta *sta, - struct ieee80211_key_conf *key, - bool have_key_offset); + struct ieee80211_key_conf *keyconf, + u8 key_offset); int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm, struct ieee80211_vif *vif, struct ieee80211_sta *sta, |