From 42fc2de5f7fc59774d727464267c3caeb284eb76 Mon Sep 17 00:00:00 2001
From: Franky Lin <frankyl@broadcom.com>
Date: Fri, 16 Dec 2011 18:36:57 -0800
Subject: [PATCH] --- yaml --- r: 279311 b: refs/heads/master c:
 2b4590569ead15fb88a83c1d8a07e3ca5507f4c6 h: refs/heads/master i:   279309:
 50ee19e825ed3a087be998551376041a4464593d   279307:
 17fded4a4721c5f7d5de147432f3ede217d300ca   279303:
 c27c7546d292f09fd9f172dce0afeb3b2145472d   279295:
 3a59d7fbd4bd7e10dfad8a676c4a89d90f8b960b v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h       | 2 +-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 4 +++-
 trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c  | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index e56047be0637..2b610ccfc5cb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5f947ad942a72e7f96942da97d719dd62037dbc2
+refs/heads/master: 2b4590569ead15fb88a83c1d8a07e3ca5507f4c6
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
index 4e59c86c245b..6577fc5c614b 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd.h
@@ -706,7 +706,7 @@ extern s32 brcmf_exec_dcmd(struct net_device *dev, u32 cmd, void *arg, u32 len);
 extern void brcmf_detach(struct device *dev);
 
 /* Indication from bus module to change flow-control state */
-extern void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool on);
+extern void brcmf_txflowcontrol(struct device *dev, int ifidx, bool on);
 
 extern bool brcmf_c_prec_enq(struct brcmf_pub *drvr, struct pktq *q,
 			 struct sk_buff *pkt, int prec);
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 6b0739b1870c..f82f87c0e753 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -348,9 +348,11 @@ static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
 	return 0;
 }
 
-void brcmf_txflowcontrol(struct brcmf_pub *drvr, int ifidx, bool state)
+void brcmf_txflowcontrol(struct device *dev, int ifidx, bool state)
 {
 	struct net_device *ndev;
+	struct brcmf_bus *bus_if = dev_get_drvdata(dev);
+	struct brcmf_pub *drvr = bus_if->drvr;
 
 	brcmf_dbg(TRACE, "Enter\n");
 
diff --git a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 6e347edda561..2253f7a05c6f 100644
--- a/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/trunk/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2289,7 +2289,7 @@ 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) &&
 	    drvr->txoff && (pktq_len(&bus->txq) < TXLOW))
-		brcmf_txflowcontrol(drvr, 0, OFF);
+		brcmf_txflowcontrol(bus->sdiodev->dev, 0, OFF);
 
 	return cnt;
 }
@@ -2602,7 +2602,7 @@ int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 	spin_unlock_bh(&bus->txqlock);
 
 	if (pktq_len(&bus->txq) >= TXHI)
-		brcmf_txflowcontrol(bus->drvr, 0, ON);
+		brcmf_txflowcontrol(bus->sdiodev->dev, 0, ON);
 
 #ifdef BCMDBG
 	if (pktq_plen(&bus->txq, prec) > qcount[prec])