Wifi: fix wifi disconnect when suspended. add keep-power-in-suspend to sdio cap.

diff --git a/arch/arm/boot/dts/rk3288-tb.dts b/arch/arm/boot/dts/rk3288-tb.dts
index 1acfe75a5f32251139dbb5c3a3e7e9b10a2765d4..777321b2fc28ba6d9ab1c0aedb92f5e7182f046d 100755 (executable)
--- a/arch/arm/boot/dts/rk3288-tb.dts
+++ b/arch/arm/boot/dts/rk3288-tb.dts
@@ -219,6 +219,7 @@
                clock-freq-min-max = <200000 50000000>;
                supports-highspeed;
                supports-sdio;
+               keep-power-in-suspend;
                //cap-sdio-irq;
                status = "okay";
 };

diff --git a/net/wireless/sysfs.c b/net/wireless/sysfs.c
index 8f28b9f798d88a48281a7b633406b99bad4b5e98..ae7f1ae44fd2b6760e2cd014c45a872e120f942a 100644 (file)
--- a/net/wireless/sysfs.c
+++ b/net/wireless/sysfs.c
@@ -100,8 +100,9 @@ static int wiphy_suspend(struct device *dev, pm_message_t state)
 
        rtnl_lock();
        if (rdev->wiphy.registered) {
-               if (!rdev->wowlan)
-                       cfg80211_leave_all(rdev);
+               //modify to fix wifi disconnet when suspended.(gwl)
+               //if (!rdev->wowlan)
+               //      cfg80211_leave_all(rdev);
                if (rdev->ops->suspend)
                        ret = rdev_suspend(rdev, rdev->wowlan);
                if (ret == 1) {