diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-02-25 10:39:21 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-28 21:19:55 -0500 |
commit | d6075c9c0ca52cc560f6a5be27c361aaa15603c6 (patch) | |
tree | 5dab8187c3d3c0ee42cf9500582e33a65991f0d2 | |
parent | 61044c4cef8b0380e8ec4b06eff24884e4c7d9b9 (diff) |
staging: brcm80211: remove osl handle from pkttotlen function
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>
-rw-r--r-- | drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 4 | ||||
-rw-r--r-- | drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | 6 | ||||
-rw-r--r-- | drivers/staging/brcm80211/include/bcmutils.h | 2 | ||||
-rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c index 4c10fd6e447..67f6127498b 100644 --- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c +++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c | |||
@@ -3309,7 +3309,7 @@ static u8 dhdsdio_rxglom(dhd_bus_t *bus, u8 rxseq) | |||
3309 | } | 3309 | } |
3310 | 3310 | ||
3311 | pfirst = bus->glom; | 3311 | pfirst = bus->glom; |
3312 | dlen = (u16) pkttotlen(osh, pfirst); | 3312 | dlen = (u16) pkttotlen(pfirst); |
3313 | 3313 | ||
3314 | /* Do an SDIO read for the superframe. Configurable iovar to | 3314 | /* Do an SDIO read for the superframe. Configurable iovar to |
3315 | * read directly into the chained packet, or allocate a large | 3315 | * read directly into the chained packet, or allocate a large |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index 7aaa958a738..eff174d0827 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | |||
@@ -658,7 +658,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi, | |||
658 | len = roundup(len, 4); | 658 | len = roundup(len, 4); |
659 | ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN); | 659 | ampdu_len += (len + (ndelim + 1) * AMPDU_DELIMITER_LEN); |
660 | 660 | ||
661 | dma_len += (u16) pkttotlen(osh, p); | 661 | dma_len += (u16) pkttotlen(p); |
662 | 662 | ||
663 | WL_AMPDU_TX("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n", | 663 | WL_AMPDU_TX("wl%d: wlc_sendampdu: ampdu_len %d seg_cnt %d null delim %d\n", |
664 | wlc->pub->unit, ampdu_len, seg_cnt, ndelim); | 664 | wlc->pub->unit, ampdu_len, seg_cnt, ndelim); |
@@ -755,7 +755,7 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi, | |||
755 | ((u8) (p->priority) == tid)) { | 755 | ((u8) (p->priority) == tid)) { |
756 | 756 | ||
757 | plen = | 757 | plen = |
758 | pkttotlen(osh, p) + AMPDU_MAX_MPDU_OVERHEAD; | 758 | pkttotlen(p) + AMPDU_MAX_MPDU_OVERHEAD; |
759 | plen = max(scb_ampdu->min_len, plen); | 759 | plen = max(scb_ampdu->min_len, plen); |
760 | 760 | ||
761 | if ((plen + ampdu_len) > maxlen) { | 761 | if ((plen + ampdu_len) > maxlen) { |
diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c index 628019862f5..a857fccdb53 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c | |||
@@ -5125,7 +5125,7 @@ wlc_prec_enq_head(struct wlc_info *wlc, struct pktq *q, struct sk_buff *pkt, | |||
5125 | tx_failed[WME_PRIO2AC(p->priority)].packets); | 5125 | tx_failed[WME_PRIO2AC(p->priority)].packets); |
5126 | WLCNTADD(wlc->pub->_wme_cnt-> | 5126 | WLCNTADD(wlc->pub->_wme_cnt-> |
5127 | tx_failed[WME_PRIO2AC(p->priority)].bytes, | 5127 | tx_failed[WME_PRIO2AC(p->priority)].bytes, |
5128 | pkttotlen(wlc->osh, p)); | 5128 | pkttotlen(p)); |
5129 | } | 5129 | } |
5130 | pkt_buf_free_skb(wlc->osh, p, true); | 5130 | pkt_buf_free_skb(wlc->osh, p, true); |
5131 | wlc->pub->_cnt->txnobuf++; | 5131 | wlc->pub->_cnt->txnobuf++; |
@@ -5776,7 +5776,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw, | |||
5776 | FC_SUBTYPE_ANY_QOS(fc)); | 5776 | FC_SUBTYPE_ANY_QOS(fc)); |
5777 | 5777 | ||
5778 | /* compute length of frame in bytes for use in PLCP computations */ | 5778 | /* compute length of frame in bytes for use in PLCP computations */ |
5779 | len = pkttotlen(osh, p); | 5779 | len = pkttotlen(p); |
5780 | phylen = len + FCS_LEN; | 5780 | phylen = len + FCS_LEN; |
5781 | 5781 | ||
5782 | /* If WEP enabled, add room in phylen for the additional bytes of | 5782 | /* 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) | |||
6702 | tx_info->flags |= IEEE80211_TX_STAT_ACK; | 6702 | tx_info->flags |= IEEE80211_TX_STAT_ACK; |
6703 | } | 6703 | } |
6704 | 6704 | ||
6705 | totlen = pkttotlen(osh, p); | 6705 | totlen = pkttotlen(p); |
6706 | free_pdu = true; | 6706 | free_pdu = true; |
6707 | 6707 | ||
6708 | wlc_txfifo_complete(wlc, queue, 1); | 6708 | wlc_txfifo_complete(wlc, queue, 1); |
diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h index a3d3f66b363..3a125b12411 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/bcmutils.h | |||
@@ -142,7 +142,7 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out); | |||
142 | /* packet */ | 142 | /* packet */ |
143 | extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, | 143 | extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, |
144 | uint offset, int len, unsigned char *buf); | 144 | uint offset, int len, unsigned char *buf); |
145 | extern uint pkttotlen(struct osl_info *osh, struct sk_buff *p); | 145 | extern uint pkttotlen(struct sk_buff *p); |
146 | 146 | ||
147 | /* ethernet address */ | 147 | /* ethernet address */ |
148 | extern int bcm_ether_atoe(char *p, u8 *ea); | 148 | extern int bcm_ether_atoe(char *p, u8 *ea); |
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index 670cde1421a..2073762f425 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c | |||
@@ -104,7 +104,7 @@ uint pktfrombuf(struct osl_info *osh, struct sk_buff *p, uint offset, int len, | |||
104 | return ret; | 104 | return ret; |
105 | } | 105 | } |
106 | /* return total length of buffer chain */ | 106 | /* return total length of buffer chain */ |
107 | uint BCMFASTPATH pkttotlen(struct osl_info *osh, struct sk_buff *p) | 107 | uint BCMFASTPATH pkttotlen(struct sk_buff *p) |
108 | { | 108 | { |
109 | uint total; | 109 | uint total; |
110 | 110 | ||