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

Commit 90d03ff7 authored by Hante Meuleman's avatar Hante Meuleman Committed by John W. Linville
Browse files

brcmfmac: Stop all net if queues on tx flow halt. 



When tx flow is to be blocked due to host interface throttle then
all net if queues should be stopped.

Reviewed-by: default avatarFranky (Zhenhui) Lin <frankyl@broadcom.com>
Reviewed-by: default avatarArend Van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarHante Meuleman <meuleman@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 871fc09f

drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ extern int brcmf_attach(uint bus_hdrlen, struct device *dev); 
extern void brcmf_detach(struct device *dev);



/* Indication from bus module to change flow-control state */

extern void brcmf_txflowcontrol(struct device *dev, int ifidx, bool on);

extern void brcmf_txflowblock(struct device *dev, bool state);



/* Notify tx completion */

extern void brcmf_txcomplete(struct device *dev, struct sk_buff *txp,

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

+10 −6
Original line number Diff line number Diff line
@@ -350,20 +350,24 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev) 
	return 0;

}



void brcmf_txflowcontrol(struct device *dev, int ifidx, bool state)

void brcmf_txflowblock(struct device *dev, bool state)

{

	struct net_device *ndev;

	struct brcmf_bus *bus_if = dev_get_drvdata(dev);

	struct brcmf_pub *drvr = bus_if->drvr;

	int i;



	brcmf_dbg(TRACE, "Enter\n");



	ndev = drvr->iflist[ifidx]->ndev;

	if (state == ON)

	for (i = 0; i < BRCMF_MAX_IFS; i++)

		if (drvr->iflist[i]) {

			ndev = drvr->iflist[i]->ndev;

			if (state)

				netif_stop_queue(ndev);

			else

				netif_wake_queue(ndev);

		}

}



static int brcmf_host_event(struct brcmf_pub *drvr, int *ifidx,

			    void *pktdata, struct brcmf_event_msg *event,

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

+4 −4
Original line number Diff line number Diff line
@@ -2235,8 +2235,8 @@ static uint brcmf_sdbrcm_sendfromq(struct brcmf_sdio *bus, uint maxframes) 
	if (bus->sdiodev->bus_if->drvr_up &&

	    (bus->sdiodev->bus_if->state == BRCMF_BUS_DATA) &&

	    bus->txoff && (pktq_len(&bus->txq) < TXLOW)) {

		bus->txoff = OFF;

		brcmf_txflowcontrol(bus->sdiodev->dev, 0, OFF);

		bus->txoff = false;

		brcmf_txflowblock(bus->sdiodev->dev, false);

	}



	return cnt;
@@ -2672,8 +2672,8 @@ static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt) 
	spin_unlock_bh(&bus->txqlock);



	if (pktq_len(&bus->txq) >= TXHI) {

		bus->txoff = ON;

		brcmf_txflowcontrol(bus->sdiodev->dev, 0, ON);

		bus->txoff = true;

		brcmf_txflowblock(bus->sdiodev->dev, true);

	}



#ifdef DEBUG