Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6034d0a1 authored Nov 05, 2012 by Hante Meuleman Committed by John W. Linville Nov 14, 2012

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>

parent 256c374f

drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -216,7 +216,7 @@ static int brcmf_netdev_start_xmit(struct sk_buff skb, struct net_device ndev)

		/* Reject if down */
		if (!drvr->bus_if->drvr_up \|\|
		(drvr->bus_if->state == BRCMF_BUS_DOWN)) {
		(drvr->bus_if->state != BRCMF_BUS_DATA)) {
		brcmf_dbg(ERROR, "xmit rejected drvup=%d state=%d\n",
		drvr->bus_if->drvr_up,
		drvr->bus_if->state);

drivers/net/wireless/brcm80211/brcmfmac/fwil.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ brcmf_fil_cmd_data(struct brcmf_if ifp, u32 cmd, void data, u32 len, bool set)
		struct brcmf_pub *drvr = ifp->drvr;
		s32 err;

		if (drvr->bus_if->state == BRCMF_BUS_DOWN) {
		if (drvr->bus_if->state != BRCMF_BUS_DATA) {
		brcmf_dbg(ERROR, "bus is down. we have nothing to do.\n");
		return -EIO;
		}