diff options
| author | Johannes Berg | 2009-11-19 00:56:28 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-11-19 17:08:50 +0100 |
| commit | 5be83de54c16944dea9c16c6a5a53c1fa75ed304 (patch) | |
| tree | dd251d9331a07ec73c7a4992c79ce30f0553db40 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | b43: Enforce DMA descriptor memory constraints (diff) | |
| download | kernel-qcow2-linux-5be83de54c16944dea9c16c6a5a53c1fa75ed304.tar.gz kernel-qcow2-linux-5be83de54c16944dea9c16c6a5a53c1fa75ed304.tar.xz kernel-qcow2-linux-5be83de54c16944dea9c16c6a5a53c1fa75ed304.zip | |
cfg80211: convert bools into flags
We've accumulated a number of options for wiphys
which make more sense as flags as we keep adding
more. Convert the existing ones.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index b80cd0bc5845..e8f405a01e3d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2400,16 +2400,14 @@ static int iwl_setup_mac(struct iwl_priv *priv) BIT(NL80211_IFTYPE_STATION) | BIT(NL80211_IFTYPE_ADHOC); - hw->wiphy->custom_regulatory = true; - - /* Firmware does not support this */ - hw->wiphy->disable_beacon_hints = true; + hw->wiphy->flags |= WIPHY_FLAG_STRICT_REGULATORY | + WIPHY_FLAG_DISABLE_BEACON_HINTS; /* * For now, disable PS by default because it affects * RX performance significantly. */ - hw->wiphy->ps_default = false; + hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT; hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX; /* we create the 802.11 header and a zero-length SSID element */ |