diff options
| author | Johannes Berg | 2012-10-12 10:55:53 +0200 |
|---|---|---|
| committer | Johannes Berg | 2012-10-18 09:01:52 +0200 |
| commit | b292219fa5061e2657ecf518b48426913d0ddae6 (patch) | |
| tree | 5e08aeaca0c5793c92febcb84ea581e54dcd6124 /drivers/net/wireless/ath/ath6kl/cfg80211.c | |
| parent | cfg80211: add scan flag to indicate its priority (diff) | |
| download | kernel-qcow2-linux-b292219fa5061e2657ecf518b48426913d0ddae6.tar.gz kernel-qcow2-linux-b292219fa5061e2657ecf518b48426913d0ddae6.tar.xz kernel-qcow2-linux-b292219fa5061e2657ecf518b48426913d0ddae6.zip | |
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>
Diffstat (limited to 'drivers/net/wireless/ath/ath6kl/cfg80211.c')
| -rw-r--r-- | drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath6kl/cfg80211.c b/drivers/net/wireless/ath/ath6kl/cfg80211.c index 7089f8160ad5..99a75d92c6cf 100644 --- a/drivers/net/wireless/ath/ath6kl/cfg80211.c +++ b/drivers/net/wireless/ath/ath6kl/cfg80211.c @@ -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 | |