2 files changed, 24 insertions, 7 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/bus.h b/drivers/net/wireless/brcm80211/brcmfmac/bus.h
index 55d36ff5439d..89e6a4dc105e 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/bus.h
@@ -185,13 +185,6 @@ void brcmf_bus_wowl_config(struct brcmf_bus *bus, bool enabled)
                 bus->ops->wowl_config(bus->dev, enabled);
 }
 
-static inline void brcmf_bus_change_state(struct brcmf_bus *bus,
-                                          enum brcmf_bus_state new_state)
-{
-        brcmf_dbg(TRACE, "%d -> %d\n", bus->state, new_state);
-        bus->state = new_state;
-}
-
 /*
  * interface functions from common layer
  */
@@ -214,6 +207,9 @@ void brcmf_txflowblock(struct device *dev, bool state);
 /* Notify the bus has transferred the tx packet to firmware */
 void brcmf_txcomplete(struct device *dev, struct sk_buff *txp, bool success);
 
+/* Configure the "global" bus state used by upper layers */
+void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state);
+
 int brcmf_bus_start(struct device *dev);
 s32 brcmf_iovar_data_set(struct device *dev, char *name, void *data, u32 len);
 void brcmf_bus_add_txhdrlen(struct device *dev, uint len);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.c b/drivers/net/wireless/brcm80211/brcmfmac/core.c
index ff8c97ba4bc5..b8520c30af7c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
@@ -1106,6 +1106,27 @@ int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
         return !err;
 }
 
+void brcmf_bus_change_state(struct brcmf_bus *bus, enum brcmf_bus_state state)
+{
+        struct brcmf_pub *drvr = bus->drvr;
+        struct net_device *ndev;
+        int ifidx;
+
+        brcmf_dbg(TRACE, "%d -> %d\n", bus->state, state);
+        bus->state = state;
+
+        if (state == BRCMF_BUS_UP) {
+                for (ifidx = 0; ifidx < BRCMF_MAX_IFS; ifidx++) {
+                        if ((drvr->iflist[ifidx]) &&
+                            (drvr->iflist[ifidx]->ndev)) {
+                                ndev = drvr->iflist[ifidx]->ndev;
+                                if (netif_queue_stopped(ndev))
+                                        netif_wake_queue(ndev);
+                        }
+                }
+        }
+}
+
 static void brcmf_driver_register(struct work_struct *work)
 {
 #ifdef CONFIG_BRCMFMAC_SDIO