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

Commit 0d8614b4 authored by Eliad Peller's avatar Eliad Peller Committed by Johannes Berg
Browse files

mac80211: replace SMPS hw flags with wiphy feature bits 



Use the new static_smps / dynamic_smps feature bits
instead of mac80211-internal hw flags.

Signed-off-by: default avatarEliad Peller <eliad@wizery.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f6993174

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

+3 −2
Original line number Diff line number Diff line
@@ -4759,7 +4759,6 @@ int ath10k_mac_register(struct ath10k *ar) 
			IEEE80211_HW_MFP_CAPABLE |

			IEEE80211_HW_REPORTS_TX_ACK_STATUS |

			IEEE80211_HW_HAS_RATE_CONTROL |

			IEEE80211_HW_SUPPORTS_STATIC_SMPS |

			IEEE80211_HW_AP_LINK_PS |

			IEEE80211_HW_SPECTRUM_MGMT;
@@ -4767,8 +4766,10 @@ int ath10k_mac_register(struct ath10k *ar) 
	 * bytes is used for padding/alignment if necessary. */

	ar->hw->extra_tx_headroom += sizeof(struct htt_data_tx_desc_frag)*2 + 4;



	ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS;



	if (ar->ht_cap_info & WMI_HT_CAP_DYNAMIC_SMPS)

		ar->hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS;

		ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;



	if (ar->ht_cap_info & WMI_HT_CAP_ENABLED) {

		ar->hw->flags |= IEEE80211_HW_AMPDU_AGGREGATION;

drivers/net/wireless/iwlegacy/4965-mac.c

+2 −3
Original line number Diff line number Diff line
@@ -5757,9 +5757,8 @@ il4965_mac_setup_register(struct il_priv *il, u32 max_probe_length) 
	    IEEE80211_HW_REPORTS_TX_ACK_STATUS | IEEE80211_HW_SUPPORTS_PS |

	    IEEE80211_HW_SUPPORTS_DYNAMIC_PS;

	if (il->cfg->sku & IL_SKU_N)

		hw->flags |=

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS |

				       NL80211_FEATURE_STATIC_SMPS;



	hw->sta_data_size = sizeof(struct il_station_priv);

	hw->vif_data_size = sizeof(struct il_vif_priv);

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

+2 −2
Original line number Diff line number Diff line
@@ -125,8 +125,8 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
	 */



	if (priv->nvm_data->sku_cap_11n_enable)

		hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

			     IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS |

				       NL80211_FEATURE_STATIC_SMPS;



	/*

	 * Enable 11w if advertised by firmware and software crypto

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

+4 −4
Original line number Diff line number Diff line
@@ -301,9 +301,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 
		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_TIMING_BEACON_ONLY |

		    IEEE80211_HW_CONNECTION_MONITOR |

		    IEEE80211_HW_CHANCTX_STA_CSA |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS;

		    IEEE80211_HW_CHANCTX_STA_CSA;



	hw->queues = mvm->first_agg_queue;

	hw->offchannel_tx_hw_queue = IWL_MVM_OFFCHANNEL_QUEUE;
@@ -405,7 +403,9 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm) 


	hw->wiphy->features |= NL80211_FEATURE_P2P_GO_CTWIN |

			       NL80211_FEATURE_LOW_PRIORITY_SCAN |

			       NL80211_FEATURE_P2P_GO_OPPPS;

			       NL80211_FEATURE_P2P_GO_OPPPS |

			       NL80211_FEATURE_DYNAMIC_SMPS |

			       NL80211_FEATURE_STATIC_SMPS;



	mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;

drivers/net/wireless/mac80211_hwsim.c

+4 −4
Original line number Diff line number Diff line
@@ -2045,8 +2045,6 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, 


	hw->flags = IEEE80211_HW_MFP_CAPABLE |

		    IEEE80211_HW_SIGNAL_DBM |

		    IEEE80211_HW_SUPPORTS_STATIC_SMPS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS |

		    IEEE80211_HW_AMPDU_AGGREGATION |

		    IEEE80211_HW_WANT_MONITOR_VIF |

		    IEEE80211_HW_QUEUE_CONTROL |
@@ -2059,8 +2057,10 @@ static int mac80211_hwsim_create_radio(int channels, const char *reg_alpha2, 
			    WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL |

			    WIPHY_FLAG_AP_UAPSD |

			    WIPHY_FLAG_HAS_CHANNEL_SWITCH;

	hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR;

	hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE;

	hw->wiphy->features |= NL80211_FEATURE_ACTIVE_MONITOR |

			       NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE |

			       NL80211_FEATURE_STATIC_SMPS |

			       NL80211_FEATURE_DYNAMIC_SMPS;



	/* ask mac80211 to reserve space for magic */

	hw->vif_data_size = sizeof(struct hwsim_vif_priv);