brcm80211: fmac: move driver up status to struct brcmf_bus

Driver up/down status to network interface need to be shared by
common layer and bus layer. Move it to bus interface structure
brcmf_bus as part of the fullmac bus interface refactoring.

Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index db30f023adc199bebb0d16137802e1c1924940be..4dcb11dff87d04b0cc510f21b85093339ea75381 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -577,6 +577,7 @@ struct brcmf_bus {
        void *drvr;             /* pointer to driver pub structure brcmf_pub */
        enum brcmf_bus_state state;
        uint maxctl;            /* Max size rxctl request from proto to bus */
+       bool drvr_up;           /* Status flag of driver up/down */
 };
 
 /* Forward decls for struct brcmf_pub (see below) */
@@ -594,7 +595,6 @@ struct brcmf_pub {
        struct device *dev;             /* fullmac dongle device pointer */
 
        /* Internal brcmf items */
-       bool up;                /* Driver up/down (to OS) */
        bool txoff;             /* Transmit flow-controlled */
        uint hdrlen;            /* Total BRCMF header length (proto + bus) */
        uint rxsz;              /* Rx buffer size bus module should use */

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 576cdc418b0ea00abe276ff14427effc4dea5325..5e9acf86d725377980b9439748e61a9cb7bcbd8e 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -273,7 +273,7 @@ static void brcmf_netdev_set_multicast_list(struct net_device *ndev)
 int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)
 {
        /* Reject if down */
-       if (!drvr->up || (drvr->bus_if->state == BRCMF_BUS_DOWN))
+       if (!drvr->bus_if->drvr_up || (drvr->bus_if->state == BRCMF_BUS_DOWN))
                return -ENODEV;
 
        /* Update multicast statistic */
@@ -303,10 +303,10 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
        brcmf_dbg(TRACE, "Enter\n");
 
        /* Reject if down */
-       if (!drvr->up ||
+       if (!drvr->bus_if->drvr_up ||
            (drvr->bus_if->state == BRCMF_BUS_DOWN)) {
-               brcmf_dbg(ERROR, "xmit rejected pub.up=%d state=%d\n",
-                         drvr->up,
+               brcmf_dbg(ERROR, "xmit rejected drvup=%d state=%d\n",
+                         drvr->bus_if->drvr_up,
                          drvr->bus_if->state);
                netif_stop_queue(ndev);
                return -ENODEV;
@@ -487,7 +487,7 @@ static struct net_device_stats *brcmf_netdev_get_stats(struct net_device *ndev)
 
        brcmf_dbg(TRACE, "Enter\n");
 
-       if (drvr->up)
+       if (drvr->bus_if->drvr_up)
                /* Use the protocol to get dongle stats */
                brcmf_proto_dstats(drvr);
 
@@ -633,7 +633,7 @@ static int brcmf_ethtool(struct brcmf_pub *drvr, void __user *uaddr)
                }
 
                /* otherwise, require dongle to be up */
-               else if (!drvr->up) {
+               else if (!drvr->bus_if->drvr_up) {
                        brcmf_dbg(ERROR, "dongle is not up\n");
                        return -ENODEV;
                }
@@ -785,11 +785,11 @@ static int brcmf_netdev_stop(struct net_device *ndev)
 
        brcmf_dbg(TRACE, "Enter\n");
        brcmf_cfg80211_down(drvr->config);
-       if (drvr->up == 0)
+       if (drvr->bus_if->drvr_up == 0)
                return 0;
 
        /* Set state and stop OS transmissions */
-       drvr->up = 0;
+       drvr->bus_if->drvr_up = 0;
        netif_stop_queue(ndev);
 
        return 0;
@@ -826,7 +826,7 @@ static int brcmf_netdev_open(struct net_device *ndev)
        }
        /* Allow transmit calls */
        netif_start_queue(ndev);
-       drvr->up = 1;
+       drvr->bus_if->drvr_up = 1;
        if (brcmf_cfg80211_up(drvr->config)) {
                brcmf_dbg(ERROR, "failed to bring up cfg80211\n");
                return -1;

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index cc2c6536957e3a6964469da0e3522b43e874dbd8..6c5b5b53279714f4eb4e486ac0c5854c16668924 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2295,7 +2295,8 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes)
        }
 
        /* Deflow-control stack if needed */
-       if (drvr->up && (drvr->bus_if->state == BRCMF_BUS_DATA) &&
+       if (drvr->bus_if->drvr_up &&
+           (drvr->bus_if->state == BRCMF_BUS_DATA) &&
            drvr->txoff && (pktq_len(&bus->txq) < TXLOW))
                brcmf_txflowcontrol(bus->sdiodev->dev, 0, OFF);
 
@@ -2974,7 +2975,7 @@ static int brcmf_sdbrcm_downloadvars(struct brcmf_sdio *bus, void *arg, int len)
        brcmf_dbg(TRACE, "Enter\n");
 
        /* Basic sanity checks */
-       if (bus->drvr->up) {
+       if (bus->sdiodev->bus_if->drvr_up) {
                bcmerror = -EISCONN;
                goto err;
        }