brcmfmac: SDIO: avoid using bus state for private states.

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / brcm80211 / brcmfmac / core.c

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.c b/drivers/net/wireless/brcm80211/brcmfmac/core.c
index effe6d7831d986f7f30ae89370ad4f58c6cdeadf..ff8c97ba4bc5ddd326038fbf08196a36e796df7b 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/core.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.c
@@ -197,7 +197,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb,
        brcmf_dbg(DATA, "Enter, idx=%d\n", ifp->bssidx);
 
        /* Can the device send data? */
-       if (drvr->bus_if->state != BRCMF_BUS_DATA) {
+       if (drvr->bus_if->state != BRCMF_BUS_UP) {
                brcmf_err("xmit rejected state=%d\n", drvr->bus_if->state);
                netif_stop_queue(ndev);
                dev_kfree_skb(skb);
@@ -637,7 +637,7 @@ static int brcmf_netdev_open(struct net_device *ndev)
        brcmf_dbg(TRACE, "Enter, idx=%d\n", ifp->bssidx);
 
        /* If bus is not ready, can't continue */
-       if (bus_if->state != BRCMF_BUS_DATA) {
+       if (bus_if->state != BRCMF_BUS_UP) {
                brcmf_err("failed bus is not ready\n");
                return -EAGAIN;
        }
@@ -964,7 +964,7 @@ int brcmf_bus_start(struct device *dev)
                p2p_ifp = NULL;
 
        /* signal bus ready */
-       brcmf_bus_change_state(bus_if, BRCMF_BUS_DATA);
+       brcmf_bus_change_state(bus_if, BRCMF_BUS_UP);
 
        /* Bus is ready, do any initialization */
        ret = brcmf_c_preinit_dcmds(ifp);
@@ -1093,9 +1093,8 @@ static int brcmf_get_pend_8021x_cnt(struct brcmf_if *ifp)
        return atomic_read(&ifp->pend_8021x_cnt);
 }
 
-int brcmf_netdev_wait_pend8021x(struct net_device *ndev)
+int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp)
 {
-       struct brcmf_if *ifp = netdev_priv(ndev);
        int err;
 
        err = wait_event_timeout(ifp->pend_8021x_wait,