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

Commit 848955cc authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: move U-APSD enablement to vif flags 



In order to let drivers have more dynamic U-APSD support,
move the enablement flag to the virtual interface driver
flags. This lets drivers not only set it up differently
for different interfaces, but also enable/disable on the
fly if needed.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 4bcc56bb

drivers/net/wireless/ath/ath10k/mac.c

+2 −1
Original line number Diff line number Diff line
@@ -2871,6 +2871,8 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
	int bit;

	u32 vdev_param;



	vif->driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;



	mutex_lock(&ar->conf_mutex);



	memset(arvif, 0, sizeof(*arvif));
@@ -5024,7 +5026,6 @@ int ath10k_mac_register(struct ath10k *ar) 
	ar->hw->flags = IEEE80211_HW_SIGNAL_DBM |

			IEEE80211_HW_SUPPORTS_PS |

			IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

			IEEE80211_HW_SUPPORTS_UAPSD |

			IEEE80211_HW_MFP_CAPABLE |

			IEEE80211_HW_REPORTS_TX_ACK_STATUS |

			IEEE80211_HW_HAS_RATE_CONTROL |

drivers/net/wireless/cw1200/main.c

+0 −1
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, 
		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_REPORTS_TX_ACK_STATUS |

		    IEEE80211_HW_SUPPORTS_UAPSD |

		    IEEE80211_HW_CONNECTION_MONITOR |

		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_TX_AMPDU_SETUP_IN_HW |

drivers/net/wireless/cw1200/sta.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ int cw1200_add_interface(struct ieee80211_hw *dev, 
	/* __le32 auto_calibration_mode = __cpu_to_le32(1); */



	vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |

			     IEEE80211_VIF_SUPPORTS_UAPSD |

			     IEEE80211_VIF_SUPPORTS_CQM_RSSI;



	mutex_lock(&priv->conf_mutex);

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

+6 −7
Original line number Diff line number Diff line
@@ -326,6 +326,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	hw->radiotap_vht_details |= IEEE80211_RADIOTAP_VHT_KNOWN_STBC |

		IEEE80211_RADIOTAP_VHT_KNOWN_BEAMFORMED;

	hw->rate_control_algorithm = "iwl-mvm-rs";

	hw->uapsd_queues = IWL_MVM_UAPSD_QUEUES;

	hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;



	/*

	 * Enable 11w if advertised by firmware and software crypto
@@ -336,13 +338,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
	    !iwlwifi_mod_params.sw_crypto)

		hw->flags |= IEEE80211_HW_MFP_CAPABLE;



	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

	    !iwlwifi_mod_params.uapsd_disable) {

		hw->flags |= IEEE80211_HW_SUPPORTS_UAPSD;

		hw->uapsd_queues = IWL_MVM_UAPSD_QUEUES;

		hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;

	}



	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN ||

	    mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {

		hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
@@ -1147,6 +1142,10 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw, 
		mvm->bf_allowed_vif = mvmvif;

		vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |

				     IEEE80211_VIF_SUPPORTS_CQM_RSSI;

		if (mvm->fw->ucode_capa.flags &

					IWL_UCODE_TLV_FLAGS_UAPSD_SUPPORT &&

		    !iwlwifi_mod_params.uapsd_disable)

			vif->driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD;

	}



	/*

drivers/net/wireless/ti/wl1251/main.c

+2 −3
Original line number Diff line number Diff line
@@ -500,6 +500,7 @@ static int wl1251_op_add_interface(struct ieee80211_hw *hw, 
	int ret = 0;



	vif->driver_flags |= IEEE80211_VIF_BEACON_FILTER |

			     IEEE80211_VIF_SUPPORTS_UAPSD |

			     IEEE80211_VIF_SUPPORTS_CQM_RSSI;



	wl1251_debug(DEBUG_MAC80211, "mac80211 add interface type %d mac %pM",
@@ -1480,9 +1481,7 @@ int wl1251_init_ieee80211(struct wl1251 *wl) 
	/* unit us */

	/* FIXME: find a proper value */



	wl->hw->flags = IEEE80211_HW_SIGNAL_DBM |

		IEEE80211_HW_SUPPORTS_PS |

		IEEE80211_HW_SUPPORTS_UAPSD;

	wl->hw->flags = IEEE80211_HW_SIGNAL_DBM | IEEE80211_HW_SUPPORTS_PS;



	wl->hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |

					 BIT(NL80211_IFTYPE_ADHOC);