staging: brcm80211: remove queue info parameter from wlc_send_q

There is only one queue on which the wlc_send_q has to operate. This
queue is available under the struct wlc_info parameter passed so
the additional queue info parameter is redundant.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
index 1a3f2ea668fe9128edd8f9c054ec749d9c2b5c93..1d7d91bc6511808ae80a9b0938e631df69b9f948 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
@@ -1133,7 +1133,7 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
 
                p = GETNEXTTXP(wlc, queue);
        }
-       wlc_send_q(wlc, wlc->pkt_queue);
+       wlc_send_q(wlc);
 
        /* update rate state */
        antselid = wlc_antsel_antsel2id(wlc->asi, mimoantsel);

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
index bf873433d21dfbaf285c09c6f8f0ec5609cc0e5c..8dbf388e6c9f1dd48f9f1f4ee527243f1990c1d4 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
@@ -420,7 +420,7 @@ bool BCMFASTPATH wlc_dpc(struct wlc_info *wlc, bool bounded)
 
        /* send any enq'd tx packets. Just makes sure to jump start tx */
        if (!pktq_empty(&wlc->pkt_queue->q))
-               wlc_send_q(wlc, wlc->pkt_queue);
+               wlc_send_q(wlc);
 
        /* it isn't done and needs to be resched if macintstatus is non-zero */
        return wlc->macintstatus != 0;
@@ -3088,7 +3088,7 @@ wlc_bmac_txstatus(struct wlc_hw_info *wlc_hw, bool bound, bool *fatal)
                morepending = true;
 
        if (!pktq_empty(&wlc->pkt_queue->q))
-               wlc_send_q(wlc, wlc->pkt_queue);
+               wlc_send_q(wlc);
 
        return morepending;
 }

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.c b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
index adece8c446e3b39dac7fff33bf75a5d341100e31..1f25fc3b6e1f50af9d1ad63f2f8fb39c1f33df0d 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.c
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.c
@@ -4933,26 +4933,23 @@ wlc_sendpkt_mac80211(struct wlc_info *wlc, struct sk_buff *sdu,
            (wlc_d11hdrs_mac80211(wlc, hw, pkt, scb, 0, 1, fifo, 0, NULL, 0)))
                return -EINVAL;
        wlc_txq_enq(wlc, scb, pkt, WLC_PRIO_TO_PREC(prio));
-       wlc_send_q(wlc, wlc->pkt_queue);
+       wlc_send_q(wlc);
 
        wlc->pub->_cnt->ieee_tx++;
        return 0;
 }
 
-void BCMFASTPATH wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi)
+void BCMFASTPATH wlc_send_q(struct wlc_info *wlc)
 {
        struct sk_buff *pkt[DOT11_MAXNUMFRAGS];
        int prec;
        u16 prec_map;
        int err = 0, i, count;
        uint fifo;
+       struct wlc_txq_info *qi = wlc->pkt_queue;
        struct pktq *q = &qi->q;
        struct ieee80211_tx_info *tx_info;
 
-       /* only do work for the packet queue */
-       if (qi != wlc->pkt_queue)
-               return;
-
        if (in_send_q)
                return;
        else
@@ -6183,7 +6180,7 @@ void wlc_high_dpc(struct wlc_info *wlc, u32 macintstatus)
 
        /* send any enq'd tx packets. Just makes sure to jump start tx */
        if (!pktq_empty(&wlc->pkt_queue->q))
-               wlc_send_q(wlc, wlc->pkt_queue);
+               wlc_send_q(wlc);
 }
 
 static void wlc_war16165(struct wlc_info *wlc, bool tx)

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_main.h b/drivers/staging/brcm80211/brcmsmac/wlc_main.h
index 0c185b5e8c50a1ad64c6cc2ecca0e667ebc42509..4f0db6cd8078cff3abf3275dcf4bf35120f77fa9 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/wlc_main.h
+++ b/drivers/staging/brcm80211/brcmsmac/wlc_main.h
@@ -856,7 +856,7 @@ extern void wlc_txflowcontrol_override(struct wlc_info *wlc,
                                       bool on, uint override);
 extern bool wlc_txflowcontrol_prio_isset(struct wlc_info *wlc,
                                         struct wlc_txq_info *qi, int prio);
-extern void wlc_send_q(struct wlc_info *wlc, struct wlc_txq_info *qi);
+extern void wlc_send_q(struct wlc_info *wlc);
 extern int wlc_prep_pdu(struct wlc_info *wlc, struct sk_buff *pdu, uint *fifo);
 
 extern u16 wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec,