diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-06-12 21:39:05 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-06-12 21:39:05 +0200 |
| commit | 812fd645968118c35a3f4d0d18dd3f4d07221df0 (patch) | |
| tree | b68ee223f22a811e9743b193872052cd264fe2d0 /drivers/net/wireless/cw1200 | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff) | |
| parent | cfg80211: fix rtnl leak in wiphy dump error cases (diff) | |
| download | linux-812fd645968118c35a3f4d0d18dd3f4d07221df0.tar.xz linux-812fd645968118c35a3f4d0d18dd3f4d07221df0.zip | |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
drivers/net/wireless/iwlwifi/mvm/mac80211.c
Diffstat (limited to 'drivers/net/wireless/cw1200')
| -rw-r--r-- | drivers/net/wireless/cw1200/main.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/net/wireless/cw1200/main.c b/drivers/net/wireless/cw1200/main.c index 9f9adb4fbfb8..da885036ca5f 100644 --- a/drivers/net/wireless/cw1200/main.c +++ b/drivers/net/wireless/cw1200/main.c @@ -245,6 +245,14 @@ module_param(cw1200_ba_tx_tids, int, 0644); MODULE_PARM_DESC(cw1200_ba_rx_tids, "Block ACK RX TIDs"); MODULE_PARM_DESC(cw1200_ba_tx_tids, "Block ACK TX TIDs"); +#ifdef CONFIG_PM +static const struct wiphy_wowlan_support cw1200_wowlan_support = { + /* Support only for limited wowlan functionalities */ + .flags = WIPHY_WOWLAN_ANY | WIPHY_WOWLAN_DISCONNECT, +}; +#endif + + static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, const bool have_5ghz) { @@ -289,10 +297,7 @@ static struct ieee80211_hw *cw1200_init_common(const u8 *macaddr, BIT(NL80211_IFTYPE_P2P_GO); #ifdef CONFIG_PM - /* Support only for limited wowlan functionalities */ - hw->wiphy->wowlan.flags = WIPHY_WOWLAN_ANY | - WIPHY_WOWLAN_DISCONNECT; - hw->wiphy->wowlan.n_patterns = 0; + hw->wiphy->wowlan = &cw1200_wowlan_support; #endif hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; |