aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/mvm/sta.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2014-11-03 09:43:04 -0500
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-11-11 00:10:26 -0500
commit7992074960a8bea6467cab3555b80a404ebd9b82 (patch)
treeccb05281c57943502d55423e3841d4cbffd85079 /drivers/net/wireless/iwlwifi/mvm/sta.c
parent82e8aea03f2f5dd2bc5c7e68dc2647b7c6cb4dd7 (diff)
iwlwifi: mvm: use correct type for firmware status
The status variable should be unsigned as the function call requires a u32 not int pointer, fix that. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/sta.c')
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/sta.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/sta.c b/drivers/net/wireless/iwlwifi/mvm/sta.c
index dd0dc5bf8583..74a7c9138ce9 100644
--- a/drivers/net/wireless/iwlwifi/mvm/sta.c
+++ b/drivers/net/wireless/iwlwifi/mvm/sta.c
@@ -1077,7 +1077,8 @@ static int iwl_mvm_send_sta_key(struct iwl_mvm *mvm,
1077{ 1077{
1078 struct iwl_mvm_add_sta_key_cmd cmd = {}; 1078 struct iwl_mvm_add_sta_key_cmd cmd = {};
1079 __le16 key_flags; 1079 __le16 key_flags;
1080 int ret, status; 1080 int ret;
1081 u32 status;
1081 u16 keyidx; 1082 u16 keyidx;
1082 int i; 1083 int i;
1083 1084
@@ -1285,7 +1286,8 @@ int iwl_mvm_remove_sta_key(struct iwl_mvm *mvm,
1285 struct iwl_mvm_sta *mvm_sta; 1286 struct iwl_mvm_sta *mvm_sta;
1286 struct iwl_mvm_add_sta_key_cmd cmd = {}; 1287 struct iwl_mvm_add_sta_key_cmd cmd = {};
1287 __le16 key_flags; 1288 __le16 key_flags;
1288 int ret, status; 1289 int ret;
1290 u32 status;
1289 u8 sta_id; 1291 u8 sta_id;
1290 1292
1291 lockdep_assert_held(&mvm->mutex); 1293 lockdep_assert_held(&mvm->mutex);