FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-27 20:07:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: brcm80211: remove osl handle from pkttotlen function

Browse Source 
The function pkttotlen was part of osl function and as such was
called with struct osl_info parameter although not used within
the function. As part of remove the whole osl concept from the
drivers this parameter has been removed from the function
prototype.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@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-02-25 16:39:21 +01:00 committed by Greg Kroah-Hartman
parent 61044c4cef
commit d6075c9c0c
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View File

@ -3309,7 +3309,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq)
} }
pfirst = bus->glom; pfirst = bus->glom;
dlen = (u16) pkttotlen(osh, pfirst); dlen = (u16) pkttotlen(pfirst);
/* Do an SDIO read for the superframe. Configurable iovar to /* Do an SDIO read for the superframe. Configurable iovar to
* read directly into the chained packet, or allocate a large * read directly into the chained packet, or allocate a large

4
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c
View File

@ -658,7 +658,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,
len = roundup(len, 4); len = roundup(len, 4);
ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN); ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN);
dma_len += (u16) pkttotlen(osh, p); dma_len += (u16) pkttotlen(p);
WL_AMPDU_TX("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n", WL_AMPDU_TX("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n",
wlc->pub->unit, ampdu_len, seg_cnt, ndelim); wlc->pub->unit, ampdu_len, seg_cnt, ndelim);
@ -755,7 +755,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,
((u8) (p->priority) == tid)) { ((u8) (p->priority) == tid)) {
plen = plen =
pkttotlen(osh, p) + AMPDU_MAX_MPDU_OVERHEAD; pkttotlen(p) + AMPDU_MAX_MPDU_OVERHEAD;
plen = max(scb_ampdu->min_len, plen); plen = max(scb_ampdu->min_len, plen);
if ((plen + ampdu_len) > maxlen) { if ((plen + ampdu_len) > maxlen) {

6
drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
View File

@ -5125,7 +5125,7 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt,
tx_failed[WME_PRIO2AC(p->priority)].packets); tx_failed[WME_PRIO2AC(p->priority)].packets);
WLCNTADD(wlc->pub->_wme_cnt-> WLCNTADD(wlc->pub->_wme_cnt->
tx_failed[WME_PRIO2AC(p->priority)].bytes, tx_failed[WME_PRIO2AC(p->priority)].bytes,
pkttotlen(wlc->osh, p)); pkttotlen(p));
} }
pkt_buf_free_skb(wlc->osh, p, true); pkt_buf_free_skb(wlc->osh, p, true);
wlc->pub->_cnt->txnobuf++; wlc->pub->_cnt->txnobuf++;
@ -5776,7 +5776,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
FC_SUBTYPE_ANY_QOS(fc)); FC_SUBTYPE_ANY_QOS(fc));
/* compute length of frame in bytes for use in PLCP computations */ /* compute length of frame in bytes for use in PLCP computations */
len = pkttotlen(osh, p); len = pkttotlen(p);
phylen = len + FCS_LEN; phylen = len + FCS_LEN;
/* If WEP enabled, add room in phylen for the additional bytes of /* If WEP enabled, add room in phylen for the additional bytes of
@ -6702,7 +6702,7 @@ wlc_dotxstatus(struct wlc_info *wlc, tx_status_t *txs, u32 frm_tx2)
tx_info->flags |= IEEE80211_TX_STAT_ACK; tx_info->flags |= IEEE80211_TX_STAT_ACK;
} }
totlen = pkttotlen(osh, p); totlen = pkttotlen(p);
free_pdu = true; free_pdu = true;
wlc_txfifo_complete(wlc, queue, 1); wlc_txfifo_complete(wlc, queue, 1);

2
drivers/staging/brcm80211/include/bcmutils.h
View File

@ -142,7 +142,7 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
/* packet */ /* packet */
extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p,
uint offset, int len, unsigned char *buf); uint offset, int len, unsigned char *buf);
extern uint pkttotlen(struct osl_info *osh, struct sk_buff *p); extern uint pkttotlen(struct sk_buff *p);
/* ethernet address */ /* ethernet address */
extern int bcm_ether_atoe(char *p, u8 *ea); extern int bcm_ether_atoe(char *p, u8 *ea);

2
drivers/staging/brcm80211/util/bcmutils.c
View File

@ -104,7 +104,7 @@ uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, uint offset, int len,
return ret; return ret;
} }
/* return total length of buffer chain */ /* return total length of buffer chain */
uint BCMFASTPATH pkttotlen(struct osl_info *osh, struct sk_buff *p) uint BCMFASTPATH pkttotlen(struct sk_buff *p)
{ {
uint total; uint total;