drivers/staging/brcm80211: Fix for suspend/resume bug

drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c

 /*
  * Copyright (c) 2010 Broadcom Corporation
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
@@ skipping 22 matching lines @@
 #include <linux/etherdevice.h>
 #include <linux/wireless.h>
 #include <linux/ieee80211.h>
 #include <net/cfg80211.h>
 
 #include <net/rtnetlink.h>
 #include <linux/mmc/sdio_func.h>
 #include <linux/firmware.h>
 #include <wl_cfg80211.h>
 
+#if defined(CONFIG_PM_SLEEP)
+extern volatile bool dhd_mmc_suspend;

[ggg, 2011/04/07 20:28:58]

I think dhd_mmc_suspend prototype belongs in brcmfmac/dhd.h.
Then include dhd.h.
bcmsdh_sdmmc.c would benefit from this as well.

+#endif  /*  defined(CONFIG_PM_SLEEP) */
+
 void sdioh_sdio_set_host_pm_flags(int flag);
 
 static struct sdio_func *cfg80211_sdio_func;
 static struct wl_dev *wl_cfg80211_dev;
 static const u8 ether_bcast[ETH_ALEN] = {255, 255, 255, 255, 255, 255};
 
 u32 wl_dbg_level = WL_DBG_ERR | WL_DBG_INFO;
 
 #define WL_4329_FW_FILE "brcm/bcm4329-fullmac-4.bin"
 #define WL_4329_NVRAM_FILE "brcm/bcm4329-fullmac-4.txt"
@@ skipping 1907 matching lines @@
                 WL_ERR("could not set fixed rate (%d) (%d)\n", err_bg, err_a);
                 return err_bg | err_a;
         }
 
         return err;
 }
 
 static s32 wl_cfg80211_resume(struct wiphy *wiphy)
 {
         s32 err = 0;
-
+        
+#if defined(CONFIG_PM_SLEEP)
+        dhd_mmc_suspend = false;
+#endif  /*  defined(CONFIG_PM_SLEEP) */
         CHECK_SYS_UP();
         wl_invoke_iscan(wiphy_to_wl(wiphy));
 
         return err;
 }
 
 static s32 wl_cfg80211_suspend(struct wiphy *wiphy)
 {
         struct wl_priv *wl = wiphy_to_wl(wiphy);
         struct net_device *ndev = wl_to_ndev(wl);
         s32 err = 0;
 
         set_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
         wl_term_iscan(wl);
         if (wl->scan_request) {
                 cfg80211_scan_done(wl->scan_request, true);     /* true means
                                                                  abort */
                 wl_set_mpc(ndev, 1);
                 wl->scan_request = NULL;
         }
         clear_bit(WL_STATUS_SCANNING, &wl->status);
         clear_bit(WL_STATUS_SCAN_ABORTING, &wl->status);
 
         sdioh_sdio_set_host_pm_flags(MMC_PM_KEEP_POWER);
 
-        return err;
+#if defined(CONFIG_PM_SLEEP)
+        dhd_mmc_suspend = true;
+#endif  /*  defined(CONFIG_PM_SLEEP) */
+        return err;
 }
 
 static __used s32
 wl_update_pmklist(struct net_device *dev, struct wl_pmk_list *pmk_list,
                   s32 err)
 {
         int i, j;
 
         WL_DBG("No of elements %d\n", pmk_list->pmkids.npmkid);
         for (i = 0; i < pmk_list->pmkids.npmkid; i++) {
@@ skipping 2209 matching lines @@
 
 err_out:
         return err;
 }
 
 static void wl_debugfs_remove_netdev(struct wl_priv *wl)
 {
         debugfs_remove_recursive(wl->debugfsdir);
         wl->debugfsdir = NULL;
 }