From: "Arend van Spriel" <arend@broadcom.com>
To: "John W. Linville" <linville@tuxdriver.com>
Cc: "Linux Wireless List" <linux-wireless@vger.kernel.org>,
"Arend van Spriel" <arend@broadcom.com>
Subject: [PATCH 09/18] brcmfmac: remove rx helper function from bus interface
Date: Wed, 2 Jan 2013 15:22:42 +0100 [thread overview]
Message-ID: <1357136572-18273-10-git-send-email-arend@broadcom.com> (raw)
In-Reply-To: <1357136572-18273-1-git-send-email-arend@broadcom.com>
The bus interface provided a wrapper function to pass a single
packet to the common driver part filling a skb queue with one
packet. For clarity the caller now sets up the skb queue and
call the rx bus interface function.
Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
---
drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h | 13 ++-----------
drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c | 4 ++--
drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c | 7 +++++--
drivers/net/wireless/brcm80211/brcmfmac/usb.c | 5 ++++-
4 files changed, 13 insertions(+), 16 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
index 358b54f..639bc2a 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_bus.h
@@ -138,17 +138,8 @@ extern bool brcmf_c_prec_enq(struct device *dev, struct pktq *q,
struct sk_buff *pkt, int prec);
/* Receive frame for delivery to OS. Callee disposes of rxp. */
-extern void brcmf_rx_frame(struct device *dev, u8 ifidx,
- struct sk_buff_head *rxlist);
-static inline void brcmf_rx_packet(struct device *dev, int ifidx,
- struct sk_buff *pkt)
-{
- struct sk_buff_head q;
-
- skb_queue_head_init(&q);
- skb_queue_tail(&q, pkt);
- brcmf_rx_frame(dev, ifidx, &q);
-}
+extern void brcmf_rx_frames(struct device *dev, u8 ifidx,
+ struct sk_buff_head *rxlist);
/* Indication from bus module regarding presence/insertion of dongle. */
extern int brcmf_attach(uint bus_hdrlen, struct device *dev);
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
index 6520b58..a820f58 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c
@@ -248,8 +248,8 @@ void brcmf_txflowblock(struct device *dev, bool state)
}
}
-void brcmf_rx_frame(struct device *dev, u8 ifidx,
- struct sk_buff_head *skb_list)
+void brcmf_rx_frames(struct device *dev, u8 ifidx,
+ struct sk_buff_head *skb_list)
{
unsigned char *eth;
uint len;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
index 651474b..13ea9b4 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/dhd_sdio.c
@@ -1405,7 +1405,7 @@ static u8 brcmf_sdbrcm_rxglom(struct brcmf_sdio *bus, u8 rxseq)
}
/* sent any remaining packets up */
if (bus->glom.qlen)
- brcmf_rx_frame(bus->sdiodev->dev, ifidx, &bus->glom);
+ brcmf_rx_frames(bus->sdiodev->dev, ifidx, &bus->glom);
bus->sdcnt.rxglomframes++;
bus->sdcnt.rxglompkts += bus->glom.qlen;
@@ -1556,6 +1556,7 @@ static void brcmf_pad(struct brcmf_sdio *bus, u16 *pad, u16 *rdlen)
static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
{
struct sk_buff *pkt; /* Packet for event or data frames */
+ struct sk_buff_head pktlist; /* needed for bus interface */
u16 pad; /* Number of pad bytes to read */
uint rxleft = 0; /* Remaining number of frames allowed */
int sdret; /* Return code from calls */
@@ -1766,7 +1767,9 @@ static uint brcmf_sdio_readframes(struct brcmf_sdio *bus, uint maxframes)
continue;
}
- brcmf_rx_packet(bus->sdiodev->dev, ifidx, pkt);
+ skb_queue_head_init(&pktlist);
+ skb_queue_tail(&pktlist, pkt);
+ brcmf_rx_frames(bus->sdiodev->dev, ifidx, &pktlist);
}
rxcount = maxframes - rxleft;
diff --git a/drivers/net/wireless/brcm80211/brcmfmac/usb.c b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
index 1df8595..34342ff 100644
--- a/drivers/net/wireless/brcm80211/brcmfmac/usb.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/usb.c
@@ -443,6 +443,7 @@ static void brcmf_usb_rx_complete(struct urb *urb)
struct brcmf_usbreq *req = (struct brcmf_usbreq *)urb->context;
struct brcmf_usbdev_info *devinfo = req->devinfo;
struct sk_buff *skb;
+ struct sk_buff_head skbq;
int ifidx = 0;
brcmf_dbg(USB, "Enter, urb->status=%d\n", urb->status);
@@ -460,13 +461,15 @@ static void brcmf_usb_rx_complete(struct urb *urb)
}
if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP) {
+ skb_queue_head_init(&skbq);
+ skb_queue_tail(&skbq, skb);
skb_put(skb, urb->actual_length);
if (brcmf_proto_hdrpull(devinfo->dev, &ifidx, skb) != 0) {
brcmf_err("rx protocol error\n");
brcmu_pkt_buf_free_skb(skb);
devinfo->bus_pub.bus->dstats.rx_errors++;
} else
- brcmf_rx_packet(devinfo->dev, ifidx, skb);
+ brcmf_rx_frames(devinfo->dev, ifidx, &skbq);
/* zero lenght packets indicate usb "failure". Do not refill */
if (urb->actual_length)
brcmf_usb_rx_refill(devinfo, req);
--
1.7.10.4
next prev parent reply other threads:[~2013-01-02 14:23 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-02 14:22 [PATCH 00/18] brcm80211: cleanup work Arend van Spriel
2013-01-02 14:22 ` [PATCH 01/18] brcmsmac: increase timer reference count for new timers only Arend van Spriel
2013-01-02 14:22 ` [PATCH 02/18] brcmsmac: use perimeter lock in add_interface() callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 03/18] brcmsmac: allow user-space setting of interface address Arend van Spriel
2013-01-02 14:22 ` [PATCH 04/18] brcmsmac: remove dead code Arend van Spriel
2013-01-02 14:22 ` [PATCH 05/18] brcmfmac: do not reconfigure refill rx on 0-length packet Arend van Spriel
2013-01-02 14:22 ` [PATCH 06/18] brcmfmac: removed deprecated set_bitrate_mask support Arend van Spriel
2013-01-02 14:22 ` [PATCH 07/18] brcmfmac: assure USB dongle firmware is reset upon module unload Arend van Spriel
2013-01-02 14:22 ` [PATCH 08/18] brcmfmac: define pr_fmt in one place Arend van Spriel
2013-01-02 17:52 ` Joe Perches
2013-01-02 20:07 ` Arend van Spriel
2013-01-02 20:20 ` [PATCH v2 " Arend van Spriel
2013-01-02 20:34 ` Joe Perches
2013-01-02 20:52 ` Arend van Spriel
2013-01-02 14:22 ` Arend van Spriel [this message]
2013-01-02 14:22 ` [PATCH 10/18] brcmfmac: remove brcmf_proto_hdrpull() from bus interface Arend van Spriel
2013-01-02 14:22 ` [PATCH 11/18] brcmfmac: Use dedicated trace level for CDC Arend van Spriel
2013-01-02 14:22 ` [PATCH 12/18] brcmfmac: remove unused event related definitions Arend van Spriel
2013-01-02 14:22 ` [PATCH 13/18] brcmfmac: cleanup netdev transmit callback Arend van Spriel
2013-01-02 14:22 ` [PATCH 14/18] brcmfmac: remove unnecessary curly braces in dhd_attach() Arend van Spriel
2013-01-02 14:22 ` [PATCH 15/18] brcmfmac: Remove unused caching dongle error Arend van Spriel
2013-01-02 14:22 ` [PATCH 16/18] brcmfmac: Return correct error on netdev xmit Arend van Spriel
2013-01-02 14:22 ` [PATCH 17/18] brcmfmac: Removing obsolete variables and inline functions Arend van Spriel
2013-01-02 14:22 ` [PATCH 18/18] brcmfmac: Update init code routines from interface up Arend van Spriel
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=1357136572-18273-10-git-send-email-arend@broadcom.com \
--to=arend@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).