diff options
| author | Johannes Berg | 2009-12-10 23:37:27 +0100 |
|---|---|---|
| committer | John W. Linville | 2009-12-22 19:56:07 +0100 |
| commit | ba37a3d0395a66b3c9164c4f4d1318317da32e96 (patch) | |
| tree | a9d17eba0a6eddb3e26365c0dec3400745521fd7 /drivers/net/wireless/iwlwifi/iwl-agn.c | |
| parent | zd1211rw: improve ejecting of fake CDROM (diff) | |
| download | kernel-qcow2-linux-ba37a3d0395a66b3c9164c4f4d1318317da32e96.tar.gz kernel-qcow2-linux-ba37a3d0395a66b3c9164c4f4d1318317da32e96.tar.xz kernel-qcow2-linux-ba37a3d0395a66b3c9164c4f4d1318317da32e96.zip | |
iwlwifi: use new mac80211 SMPS
Instead of hard-coding the SM PS mode per hardware,
this makes iwlwifi support the new mac80211 API for
controlling the SM PS mode.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
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 | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index 0b3669f317a4..904b5d8da860 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c @@ -2623,6 +2623,10 @@ static int iwl_setup_mac(struct iwl_priv *priv) hw->flags |= IEEE80211_HW_SUPPORTS_PS | IEEE80211_HW_SUPPORTS_DYNAMIC_PS; + if (priv->cfg->sku & IWL_SKU_N) + hw->flags |= IEEE80211_HW_SUPPORTS_DYNAMIC_SMPS | + IEEE80211_HW_SUPPORTS_STATIC_SMPS; + hw->sta_data_size = sizeof(struct iwl_station_priv); hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) | @@ -3361,6 +3365,7 @@ static int iwl_init_drv(struct iwl_priv *priv) priv->band = IEEE80211_BAND_2GHZ; priv->iw_mode = NL80211_IFTYPE_STATION; + priv->current_ht_config.smps = IEEE80211_SMPS_STATIC; /* Choose which receivers/antennas to use */ if (priv->cfg->ops->hcmd->set_rxon_chain) |