brcm80211: smac: use sk_buff list for handling frames in receive path

In the receive path the frames are obtained from the dma using
multiple sk_buff that were linked using the skb next pointer.
This has been changed and it now used sk_buff lists and skb_queue
functions instead.

Reported-by: Johannes Berg <johannes@sipsolutions.net>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Alwin Beukers <alwin@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 8 insertions, 13 deletions

diff --git a/drivers/net/wireless/brcm80211/brcmsmac/main.c b/drivers/net/wireless/brcm80211/brcmsmac/main.c
index 3f8a6c7d7a23..f193fab675dc 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/main.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/main.c
@@ -8115,21 +8115,17 @@ static bool
 brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
 {
         struct sk_buff *p;
-        struct sk_buff *head = NULL;
-        struct sk_buff *tail = NULL;
+        struct sk_buff *next = NULL;
+        struct sk_buff_head recv_frames;
+
         uint n = 0;
         uint bound_limit = bound ? RXBND : -1;
 
         BCMMSG(wlc_hw->wlc->wiphy, "wl%d\n", wlc_hw->unit);
-        /* gather received frames */
-        while ((p = dma_rx(wlc_hw->di[fifo]))) {
+        skb_queue_head_init(&recv_frames);
 
-                if (!tail)
-                        head = tail = p;
-                else {
-                        tail->prev = p;
-                        tail = p;
-                }
+        /* gather received frames */
+        while (dma_rx(wlc_hw->di[fifo], &recv_frames)) {
 
                 /* !give others some time to run! */
                 if (++n >= bound_limit)
@@ -8140,12 +8136,11 @@ brcms_b_recv(struct brcms_hardware *wlc_hw, uint fifo, bool bound)
         dma_rxfill(wlc_hw->di[fifo]);
 
         /* process each frame */
-        while ((p = head) != NULL) {
+        skb_queue_walk_safe(&recv_frames, p, next) {
                 struct d11rxhdr_le *rxh_le;
                 struct d11rxhdr *rxh;
-                head = head->prev;
-                p->prev = NULL;
 
+                skb_unlink(p, &recv_frames);
                 rxh_le = (struct d11rxhdr_le *)p->data;
                 rxh = (struct d11rxhdr *)p->data;