All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Franky Lin" <frankyl@broadcom.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 25/30] brcm80211: fmac: abstract bus_txdata interface function pointer
Date: Fri, 16 Dec 2011 18:37:15 -0800	[thread overview]
Message-ID: <1324089440-8957-26-git-send-email-frankyl@broadcom.com> (raw)
In-Reply-To: <1324089440-8957-1-git-send-email-frankyl@broadcom.com>

Abstract bus layer brcmf_bus_txdata function pointer for common
layer. This patch is 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>
---
 drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h  |    5 ++---
 .../net/wireless/brcm80211/brcmfmac/dhd_linux.c    |    2 +-
 drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c |    3 ++-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 5d5f2af..d5e0ec3 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -53,6 +53,8 @@ struct brcmf_bus {
 	void (*brcmf_bus_stop)(struct device *);
 	/* Initialize bus module: prepare for communication w/dongle */
 	int (*brcmf_bus_init)(struct device *);
+	/* Send a data frame to the dongle.  Callee disposes of txp. */
+	int (*brcmf_bus_txdata)(struct device *, struct sk_buff *);
 };
 
 /*
@@ -99,9 +101,6 @@ extern int brcmf_add_if(struct device *dev, int ifidx,
 /*
  * Exported from brcmf bus module (brcmf_usb, brcmf_sdio)
  */
-/* Send a data frame to the dongle.  Callee disposes of txp. */
-extern int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *txp);
-
 /* Send/receive a control message to/from the dongle.
  * Expects caller to enforce a single outstanding transaction.
  */
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 62b4575..72bee2c 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -291,7 +291,7 @@ int brcmf_sendpkt(struct brcmf_pub *drvr, int ifidx, struct sk_buff *pktbuf)
 	brcmf_proto_hdrpush(drvr, ifidx, pktbuf);
 
 	/* Use bus module to send data frame */
-	return brcmf_sdbrcm_bus_txdata(drvr->dev, pktbuf);
+	return drvr->bus_if->brcmf_bus_txdata(drvr->dev, pktbuf);
 }
 
 static int brcmf_netdev_start_xmit(struct sk_buff *skb, struct net_device *ndev)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 5089b64..6a30950 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -2655,7 +2655,7 @@ static int brcmf_sdbrcm_dpc_thread(void *data)
 	return 0;
 }
 
-int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
+static int brcmf_sdbrcm_bus_txdata(struct device *dev, struct sk_buff *pkt)
 {
 	int ret = -EBADE;
 	uint datalen, prec;
@@ -3955,6 +3955,7 @@ void *brcmf_sdbrcm_probe(u32 regsva, struct brcmf_sdio_dev *sdiodev)
 	/* Assign bus interface call back */
 	bus->sdiodev->bus_if->brcmf_bus_stop = brcmf_sdbrcm_bus_stop;
 	bus->sdiodev->bus_if->brcmf_bus_init = brcmf_sdbrcm_bus_init;
+	bus->sdiodev->bus_if->brcmf_bus_txdata = brcmf_sdbrcm_bus_txdata;
 	/* Attach to the brcmf/OS/network interface */
 	ret = brcmf_attach(SDPCM_RESERVE, bus->sdiodev->dev);
 	if (ret != 0) {
-- 
1.7.5.4



  parent reply	other threads:[~2011-12-17  2:37 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-12-17  2:36 [PATCH 00/30] brcmfmac: the last batch of bus interface refactoring Franky Lin
2011-12-17  2:36 ` [PATCH 01/30] brcm80211: fmac: unify common layer driver data structure Franky Lin
2011-12-17  2:36 ` [PATCH 02/30] brcm80211: fmac: remove oneline proto block functions Franky Lin
2011-12-17  2:36 ` [PATCH 03/30] brcm80211: fmac: register a dummy irq handler for SDIO function 2 Franky Lin
2011-12-17  2:36 ` [PATCH 04/30] brcm80211: fmac: change function add_if parameter Franky Lin
2011-12-17  2:36 ` [PATCH 05/30] brcm80211: fmac: change function bus_start parameter Franky Lin
2011-12-17  2:36 ` [PATCH 06/30] brcm80211: fmac: change function brcmf_detach parameter Franky Lin
2011-12-17  2:36 ` [PATCH 07/30] brcm80211: fmac: change function txflowcontrol parameter Franky Lin
2011-12-17  2:36 ` [PATCH 08/30] brcm80211: fmac: change function txcomplete parameter Franky Lin
2011-12-17  2:36 ` [PATCH 09/30] brcm80211: fmac: change function brcmf_c_prec_enq parameter Franky Lin
2011-12-17  2:37 ` [PATCH 10/30] brcm80211: fmac: change function rx_frame parameter Franky Lin
2011-12-17  2:37 ` [PATCH 11/30] brcm80211: fmac: change function proto_hdrpull parameter Franky Lin
2011-12-17  2:37 ` [PATCH 12/30] brcm80211: fmac: move sdio used statistics to struct brcmf_sdio Franky Lin
2011-12-17  2:37 ` [PATCH 13/30] brcm80211: fmac: move maxctl to struct brcmf_bus Franky Lin
2011-12-17  2:37 ` [PATCH 14/30] brcm80211: fmac: move driver up status " Franky Lin
2011-12-17  2:37 ` [PATCH 15/30] brcm80211: fmac: remove duplicate statistics from driver data structure Franky Lin
2011-12-17  2:37 ` [PATCH 16/30] brcm80211: fmac: move dongle statistics to struct brcmf_bus Franky Lin
2011-12-17  2:37 ` [PATCH 17/30] brcm80211: fmac: move packet realloc stats " Franky Lin
2011-12-17  2:37 ` [PATCH 18/30] brcm80211: fmac: move tx flow ctrl flag to bus layer Franky Lin
2011-12-17  2:37 ` [PATCH 19/30] brcm80211: fmac: stop referencing brcmf_pub in " Franky Lin
2011-12-17  2:37 ` [PATCH 20/30] brcm80211: fmac: stop referencing brcmf_sdio in common layer Franky Lin
2011-12-17  2:37 ` [PATCH 21/30] brcm80211: fmac: move sdio related macros to sdio_host.h Franky Lin
2011-12-17  2:37 ` [PATCH 22/30] brcm80211: fmac: abstract bus_stop interface function pointer Franky Lin
2011-12-17  2:37 ` [PATCH 23/30] brcm80211: fmac: move common layer bus interface context to dhd_bus.h Franky Lin
2011-12-17  2:37 ` [PATCH 24/30] brcm80211: fmac: abstract bus_init interface function pointer Franky Lin
2011-12-17  2:37 ` Franky Lin [this message]
2011-12-17  2:37 ` [PATCH 26/30] brcm80211: fmac: abstract ctrl frames interface function pointers Franky Lin
2011-12-17  2:37 ` [PATCH 27/30] brcm80211: fmac: move debug level macros to dhd_dbg.h Franky Lin
2011-12-17  2:37 ` [PATCH 28/30] brcm80211: fmac: move idle macros to dhd_sdio.c Franky Lin
2011-12-17  2:37 ` [PATCH 29/30] brcm80211: fmac: exclude unnecessary header files Franky Lin
2011-12-17  2:37 ` [PATCH 30/30] brcm80211: fmac: add Kconfig option for SDIO bus support Franky Lin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1324089440-8957-26-git-send-email-frankyl@broadcom.com \
    --to=frankyl@broadcom.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.