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

Commit b292219f authored Oct 12, 2012 by Johannes Berg

wireless: use OR operation to set wiphy features



The next patch will introduce a flag that is set
by default in cfg80211 so drivers and mac80211
need to use |= to set features they have so that
they don't clear the already-set feature.

We could set the flag in wiphy_register() instead
of wiphy_new() to avoid this patch, but then the
drivers couldn't *unset* flags they don't want to
use even though the implementation is generic.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 46856bbf

drivers/net/wireless/ath/ath6kl/cfg80211.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -3651,7 +3651,7 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)

		if (test_bit(ATH6KL_FW_CAPABILITY_INACTIVITY_TIMEOUT,
		ar->fw_capabilities))
		ar->wiphy->features = NL80211_FEATURE_INACTIVITY_TIMER;
		ar->wiphy->features \|= NL80211_FEATURE_INACTIVITY_TIMER;

		ar->wiphy->probe_resp_offload =
		NL80211_PROBE_RESP_OFFLOAD_SUPPORT_WPS \|

drivers/net/wireless/mwifiex/cfg80211.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -2250,7 +2250,7 @@ int mwifiex_register_cfg80211(struct mwifiex_adapter *adapter)
		wiphy->available_antennas_tx = BIT(adapter->number_of_antenna) - 1;
		wiphy->available_antennas_rx = BIT(adapter->number_of_antenna) - 1;

		wiphy->features = NL80211_FEATURE_HT_IBSS \|
		wiphy->features \|= NL80211_FEATURE_HT_IBSS \|
		NL80211_FEATURE_INACTIVITY_TIMER;

		/* Reserve space for mwifiex specific private data for BSS */

net/mac80211/main.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -598,7 +598,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
		if (ops->remain_on_channel)
		wiphy->flags \|= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;

		wiphy->features = NL80211_FEATURE_SK_TX_STATUS \|
		wiphy->features \|= NL80211_FEATURE_SK_TX_STATUS \|
		NL80211_FEATURE_SAE \|
		NL80211_FEATURE_HT_IBSS;