Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b530e95 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: use iwl_mvm_vif_from_mac80211() consistently 



There are a few places not using it, use it at those places.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a70393fc

drivers/net/wireless/iwlwifi/mvm/coex.c

+2 −2
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm, 
static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,

				   struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_bt_iterator_data *data = _data;

	struct iwl_mvm *mvm = data->mvm;
@@ -1025,7 +1025,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac, 
void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			   enum ieee80211_rssi_event rssi_event)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_bt_iterator_data data = {

		.mvm = mvm,

	};

drivers/net/wireless/iwlwifi/mvm/coex_legacy.c

+2 −2
Original line number Diff line number Diff line
@@ -1034,7 +1034,7 @@ int iwl_mvm_rx_bt_coex_notif_old(struct iwl_mvm *mvm, 
static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,

				     struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_bt_iterator_data *data = _data;

	struct iwl_mvm *mvm = data->mvm;
@@ -1070,7 +1070,7 @@ static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac, 
void iwl_mvm_bt_rssi_event_old(struct iwl_mvm *mvm, struct ieee80211_vif *vif,

			       enum ieee80211_rssi_event rssi_event)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

	struct iwl_bt_iterator_data data = {

		.mvm = mvm,

	};

drivers/net/wireless/iwlwifi/mvm/sta.c

+2 −2
Original line number Diff line number Diff line
@@ -1144,7 +1144,7 @@ static int iwl_mvm_set_fw_key_idx(struct iwl_mvm *mvm) 
static u8 iwl_mvm_get_key_sta_id(struct ieee80211_vif *vif,

				 struct ieee80211_sta *sta)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (sta) {

		struct iwl_mvm_sta *mvm_sta = (void *)sta->drv_priv;
@@ -1280,7 +1280,7 @@ static inline u8 *iwl_mvm_get_mac_addr(struct iwl_mvm *mvm, 
				       struct ieee80211_vif *vif,

				       struct ieee80211_sta *sta)

{

	struct iwl_mvm_vif *mvmvif = (void *)vif->drv_priv;

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);



	if (sta)

		return sta->addr;