evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: brcm80211: remove queue info parameter from wlc_send_q

Browse source 
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>
This commit is contained in:
Arend van Spriel 2011-05-03 11:35:30 +02:00 • committed by Greg Kroah-Hartman
parent 3a7305002c
commit 931f64a9d6
4 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View file

@ -1133,7 +1133,7 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
p = GETNEXTTXP(wlc, queue); p = GETNEXTTXP(wlc, queue);
} }
wlc_send_q(wlc, wlc->pkt_queue); wlc_send_q(wlc);
/* update rate state */ /* update rate state */
antselid = wlc_antsel_antsel2id(wlc->asi, mimoantsel); antselid = wlc_antsel_antsel2id(wlc->asi, mimoantsel);

4
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c
View file

@ -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 */ /* send any enq'd tx packets. Just makes sure to jump start tx */
if (!pktq_empty(&wlc->pkt_queue->q)) 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 */ /* it isn't done and needs to be resched if macintstatus is non-zero */
return wlc->macintstatus != 0; return wlc->macintstatus != 0;
@ -3088,7 +3088,7 @@ wlc_bmac_txstatus(struct wlc_hw_info *wlc_hw, bool bound, bool *fatal)
morepending = true; morepending = true;
if (!pktq_empty(&wlc->pkt_queue->q)) if (!pktq_empty(&wlc->pkt_queue->q))
wlc_send_q(wlc, wlc->pkt_queue); wlc_send_q(wlc);
return morepending; return morepending;
} }

11
drivers/staging/brcm80211/brcmsmac/wlc_main.c
View file

@ -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))) (wlc_d11hdrs_mac80211(wlc, hw, pkt, scb, 0, 1, fifo, 0, NULL, 0)))
return -EINVAL; return -EINVAL;
wlc_txq_enq(wlc, scb, pkt, WLC_PRIO_TO_PREC(prio)); 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++; wlc->pub->_cnt->ieee_tx++;
return 0; 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]; struct sk_buff *pkt[DOT11_MAXNUMFRAGS];
int prec; int prec;
u16 prec_map; u16 prec_map;
int err = 0, i, count; int err = 0, i, count;
uint fifo; uint fifo;
struct wlc_txq_info *qi = wlc->pkt_queue;
struct pktq *q = &qi->q; struct pktq *q = &qi->q;
struct ieee80211_tx_info *tx_info; struct ieee80211_tx_info *tx_info;
/* only do work for the packet queue */
if (qi != wlc->pkt_queue)
return;
if (in_send_q) if (in_send_q)
return; return;
else 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 */ /* send any enq'd tx packets. Just makes sure to jump start tx */
if (!pktq_empty(&wlc->pkt_queue->q)) 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) static void wlc_war16165(struct wlc_info *wlc, bool tx)

2
drivers/staging/brcm80211/brcmsmac/wlc_main.h
View file

@ -856,7 +856,7 @@ extern void wlc_txflowcontrol_override(struct wlc_info *wlc,
bool on, uint override); bool on, uint override);
extern bool wlc_txflowcontrol_prio_isset(struct wlc_info *wlc, extern bool wlc_txflowcontrol_prio_isset(struct wlc_info *wlc,
struct wlc_txq_info *qi, int prio); 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 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, extern u16 wlc_calc_lsig_len(struct wlc_info *wlc, ratespec_t ratespec,