diff options
author | Hante Meuleman <meuleman@broadcom.com> | 2012-11-05 19:22:29 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2012-11-14 14:56:02 -0500 |
commit | 6034d0a19175a3b898dc9f3ee5740275620969a2 (patch) | |
tree | 0a9ec857f31c5034e618e5bf9ec073934737059c | |
parent | 256c374f7702c8c20413d2d7a14776dfad524a8d (diff) |
brcmfmac: check bus state to be data before sending data.
brcmf_netdev_start_xmit and brcmf_fil_cmd_data are checking
bus state for down. These functions should check for data
state.
Reviewed-by: Arend Van Spriel <arend@broadcom.com>
Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
Signed-off-by: Franky Lin <frankyl@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/brcm80211/brcmfmac/fwil.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c index 0f81f31be01..a0d8950ed5b 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | |||
@@ -216,7 +216,7 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev) | |||
216 | 216 | ||
217 | /* Reject if down */ | 217 | /* Reject if down */ |
218 | if (!drvr->bus_if->drvr_up || | 218 | if (!drvr->bus_if->drvr_up || |
219 | (drvr->bus_if->state == BRCMF_BUS_DOWN)) { | 219 | (drvr->bus_if->state != BRCMF_BUS_DATA)) { |
220 | brcmf_dbg(ERROR, "xmit rejected drvup=%d state=%d\n", | 220 | brcmf_dbg(ERROR, "xmit rejected drvup=%d state=%d\n", |
221 | drvr->bus_if->drvr_up, | 221 | drvr->bus_if->drvr_up, |
222 | drvr->bus_if->state); | 222 | drvr->bus_if->state); |
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c index f121d412495..62e0960c1d3 100644 --- a/drivers/net/wireless/brcm80211/brcmfmac/fwil.c +++ b/drivers/net/wireless/brcm80211/brcmfmac/fwil.c | |||
@@ -35,7 +35,7 @@ brcmf_fil_cmd_data(struct brcmf_if *ifp, u32 cmd, void *data, u32 len, bool set) | |||
35 | struct brcmf_pub *drvr = ifp->drvr; | 35 | struct brcmf_pub *drvr = ifp->drvr; |
36 | s32 err; | 36 | s32 err; |
37 | 37 | ||
38 | if (drvr->bus_if->state == BRCMF_BUS_DOWN) { | 38 | if (drvr->bus_if->state != BRCMF_BUS_DATA) { |
39 | brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n"); | 39 | brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n"); |
40 | return -EIO; | 40 | return -EIO; |
41 | } | 41 | } |