From: zzc <zzc@rock-chips.com>
Date: Mon, 13 Jun 2016 03:29:02 +0000 (+0800)
Subject: net: wireless: rockchip_wlan: rkwifi: fix softap issue
X-Git-Tag: firefly_0821_release~2474
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=f1355a3b8e62020eb63dbfea0fbeaff74973b503;p=firefly-linux-kernel-4.4.55.git

net: wireless: rockchip_wlan: rkwifi: fix softap issue

Change-Id: I8eb4a60c1e81b357eeb3aabdfa2aadbcc523d0d5
Signed-off-by: zzc <zzc@rock-chips.com>
---

diff --git a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.c b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.c
index 5fe24615578d..89efcf1c484e 100755
--- a/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.c
+++ b/drivers/net/wireless/rockchip_wlan/rkwifi/bcmdhd/wl_cfg80211.c
@@ -8034,7 +8034,7 @@ wl_cfg80211_start_ap(
 	/* Set GC/STA SCB expiry timings. */
 	if ((err = wl_cfg80211_set_scb_timings(cfg, dev))) {
 		WL_ERR(("scb setting failed \n"));
-		goto fail;
+		/*goto fail;*/
 	}
 
 	WL_DBG(("** AP/GO Created **\n"));
@@ -8169,6 +8169,13 @@ wl_cfg80211_stop_ap(
 				}
 			}
 		} else if (is_rsdb_supported == 0) {
+			/* terence 20160426: fix softap issue */
+			err = wldev_ioctl(dev, WLC_SET_AP, &ap, sizeof(s32), true);
+			if (err < 0) {
+				WL_ERR(("setting AP mode failed %d \n", err));
+				err = -ENOTSUPP;
+				goto exit;
+			}
 			err = wldev_ioctl(dev, WLC_SET_INFRA, &infra, sizeof(s32), true);
 			if (err < 0) {
 				WL_ERR(("SET INFRA error %d\n", err));