diff options
author | Eliad Peller <eliad@wizery.com> | 2014-12-29 01:24:05 -0500 |
---|---|---|
committer | Kalle Valo <kvalo@codeaurora.org> | 2015-01-09 08:47:54 -0500 |
commit | b8714d1b6a7ee4c4e4730203a90e1db6485d9343 (patch) | |
tree | d8cc8be040e07a5352a069b7ee60649512356403 /drivers/net/wireless/ti | |
parent | 6d5a748d4836ddd0ca626fe4870942a0e90a5c3d (diff) |
wlcore: enable AP wowlan
configure wowlan when host is suspended in AP mode,
since the FW can now wake the host up on Rx.
Signed-off-by: Kobi Leibovitch <kobi.lev100@gmail.com>
Signed-off-by: Arik Nemtsov <arik@wizery.com>
Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/net/wireless/ti')
-rw-r--r-- | drivers/net/wireless/ti/wlcore/main.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/drivers/net/wireless/ti/wlcore/main.c b/drivers/net/wireless/ti/wlcore/main.c index de3bf781be6e..caff69966ce1 100644 --- a/drivers/net/wireless/ti/wlcore/main.c +++ b/drivers/net/wireless/ti/wlcore/main.c | |||
@@ -1707,7 +1707,8 @@ out: | |||
1707 | } | 1707 | } |
1708 | 1708 | ||
1709 | static int wl1271_configure_suspend_ap(struct wl1271 *wl, | 1709 | static int wl1271_configure_suspend_ap(struct wl1271 *wl, |
1710 | struct wl12xx_vif *wlvif) | 1710 | struct wl12xx_vif *wlvif, |
1711 | struct cfg80211_wowlan *wow) | ||
1711 | { | 1712 | { |
1712 | int ret = 0; | 1713 | int ret = 0; |
1713 | 1714 | ||
@@ -1715,6 +1716,12 @@ static int wl1271_configure_suspend_ap(struct wl1271 *wl, | |||
1715 | goto out; | 1716 | goto out; |
1716 | 1717 | ||
1717 | ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true); | 1718 | ret = wl1271_acx_beacon_filter_opt(wl, wlvif, true); |
1719 | if (ret < 0) | ||
1720 | goto out; | ||
1721 | |||
1722 | ret = wl1271_configure_wowlan(wl, wow); | ||
1723 | if (ret < 0) | ||
1724 | goto out; | ||
1718 | 1725 | ||
1719 | out: | 1726 | out: |
1720 | return ret; | 1727 | return ret; |
@@ -1728,7 +1735,7 @@ static int wl1271_configure_suspend(struct wl1271 *wl, | |||
1728 | if (wlvif->bss_type == BSS_TYPE_STA_BSS) | 1735 | if (wlvif->bss_type == BSS_TYPE_STA_BSS) |
1729 | return wl1271_configure_suspend_sta(wl, wlvif, wow); | 1736 | return wl1271_configure_suspend_sta(wl, wlvif, wow); |
1730 | if (wlvif->bss_type == BSS_TYPE_AP_BSS) | 1737 | if (wlvif->bss_type == BSS_TYPE_AP_BSS) |
1731 | return wl1271_configure_suspend_ap(wl, wlvif); | 1738 | return wl1271_configure_suspend_ap(wl, wlvif, wow); |
1732 | return 0; | 1739 | return 0; |
1733 | } | 1740 | } |
1734 | 1741 | ||
@@ -1741,12 +1748,13 @@ static void wl1271_configure_resume(struct wl1271 *wl, struct wl12xx_vif *wlvif) | |||
1741 | if ((!is_ap) && (!is_sta)) | 1748 | if ((!is_ap) && (!is_sta)) |
1742 | return; | 1749 | return; |
1743 | 1750 | ||
1744 | if (is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) | 1751 | if ((is_sta && !test_bit(WLVIF_FLAG_STA_ASSOCIATED, &wlvif->flags)) || |
1752 | (is_ap && !test_bit(WLVIF_FLAG_AP_STARTED, &wlvif->flags))) | ||
1745 | return; | 1753 | return; |
1746 | 1754 | ||
1747 | if (is_sta) { | 1755 | wl1271_configure_wowlan(wl, NULL); |
1748 | wl1271_configure_wowlan(wl, NULL); | ||
1749 | 1756 | ||
1757 | if (is_sta) { | ||
1750 | if ((wl->conf.conn.suspend_wake_up_event == | 1758 | if ((wl->conf.conn.suspend_wake_up_event == |
1751 | wl->conf.conn.wake_up_event) && | 1759 | wl->conf.conn.wake_up_event) && |
1752 | (wl->conf.conn.suspend_listen_interval == | 1760 | (wl->conf.conn.suspend_listen_interval == |