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>

diff --git a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
index 4c10fd6e447fc90a3b51b72af9115b897a507189..67f6127498bd902893861d84eac6b4ea173ac316 100644 (file)
--- 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)
                }
 
                pfirst = bus->glom;
-               dlen = (u16) pkttotlen(osh, pfirst);
+               dlen = (u16) pkttotlen(pfirst);
 
                /* Do an SDIO read for the superframe.  Configurable iovar to
                 * 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 7aaa958a738d818140d5277c9be35f5cc8475929..eff174d0827b4f3bc4a91d2bb9e3e5ae947e7e53 100644 (file)
--- 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,
                len = roundup(len, 4);
                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",
                            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)) {
 
                                plen =
-                                   pkttotlen(osh, p) + AMPDU_MAX_MPDU_OVERHEAD;
+                                   pkttotlen(p) + AMPDU_MAX_MPDU_OVERHEAD;
                                plen = max(scb_ampdu->min_len, plen);
 
                                if ((plen + ampdu_len) > maxlen) {

diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wlc_mac80211.c
index 628019862f5841affef1ae3628adb4be8825ac31..a857fccdb53014daec553f66dc7d8c8cc4467a12 100644 (file)
--- 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,
                                  tx_failed[WME_PRIO2AC(p->priority)].packets);
                        WLCNTADD(wlc->pub->_wme_cnt->
                                 tx_failed[WME_PRIO2AC(p->priority)].bytes,
-                                pkttotlen(wlc->osh, p));
+                                pkttotlen(p));
                }
                pkt_buf_free_skb(wlc->osh, p, true);
                wlc->pub->_cnt->txnobuf++;
@@ -5776,7 +5776,7 @@ wlc_d11hdrs_mac80211(struct wlc_info *wlc, struct ieee80211_hw *hw,
               FC_SUBTYPE_ANY_QOS(fc));
 
        /* compute length of frame in bytes for use in PLCP computations */
-       len = pkttotlen(osh, p);
+       len = pkttotlen(p);
        phylen = len + FCS_LEN;
 
        /* 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;
        }
 
-       totlen = pkttotlen(osh, p);
+       totlen = pkttotlen(p);
        free_pdu = true;
 
        wlc_txfifo_complete(wlc, queue, 1);

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index a3d3f66b36385c74b20f3d8a751e207dc44d2840..3a125b12411423f75bc99ea89079dd27b8d26a2c 100644 (file)
--- 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);
 /* packet */
        extern uint pktfrombuf(struct osl_info *osh, struct sk_buff *p,
                               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 */
        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 670cde1421a3ac51669cca2f1f0bed4bf40d93ad..2073762f425d396e9cc6eb722b2acee7d11ce7a8 100644 (file)
--- 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,
        return ret;
 }
 /* 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;