staging: brcm80211: use common pktq_flush functions

The softmac and fullmac drivers can use the same implementation of
pktq_flush(), so remove the unnecessary version.

Cc: devel@linuxdriverproject.org
Cc: linux-wireless@vger.kernel.org
Reviewed-by: Roland Vossen <rvossen@broadcoom.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 4bfd8d867d29c0afd6e6b6fb4330871481e1c8bc..c1d22c845bfc12b99141f37300a2fe353a9047e6 100644 (file)
--- a/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
+++ b/drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
@@ -2835,7 +2835,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex)
        dhdsdio_clkctl(bus, CLK_SDONLY, false);
 
        /* Clear the data packet queues */
-       pktq_flush(&bus->txq, true);
+       pktq_flush(&bus->txq, true, NULL, 0);
 
        /* Clear any held glomming stuff */
        if (bus->glomd)

diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h
index 0dd63a21a9f62d2ce87d8d1a935e6dc6fd3775b8..d83a50451878a7427f953b42a315753f13ab2a61 100644 (file)
--- a/drivers/staging/brcm80211/include/bcmutils.h
+++ b/drivers/staging/brcm80211/include/bcmutils.h
@@ -99,13 +99,8 @@ extern struct sk_buff *pkt_buf_get_skb(uint len);
 extern void pkt_buf_free_skb(struct sk_buff *skb);
 
 /* Empty the queue at particular precedence level */
-#ifdef BRCM_FULLMAC
-       extern void pktq_pflush(struct pktq *pq, int prec,
-               bool dir);
-#else
-       extern void pktq_pflush(struct pktq *pq, int prec,
-               bool dir, ifpkt_cb_t fn, int arg);
-#endif /* BRCM_FULLMAC */
+extern void pktq_pflush(struct pktq *pq, int prec,
+       bool dir, ifpkt_cb_t fn, int arg);
 
 /* operations on a set of precedences in packet queue */
 
@@ -130,12 +125,8 @@ extern struct sk_buff *pktq_mdeq(struct pktq *pq, uint prec_bmp, int *prec_out);
        extern void pktq_init(struct pktq *pq, int num_prec, int max_len);
 /* prec_out may be NULL if caller is not interested in return value */
        extern struct sk_buff *pktq_peek_tail(struct pktq *pq, int *prec_out);
-#ifdef BRCM_FULLMAC
-       extern void pktq_flush(struct pktq *pq, bool dir);
-#else
        extern void pktq_flush(struct pktq *pq, bool dir,
                ifpkt_cb_t fn, int arg);
-#endif
 
 /* externs */
 /* packet */

diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c
index 7337a75387ad40a7ff72d574d23e5e5e9d503d84..95214cf27710074cc1ef686edc4c2e7964fcaed1 100644 (file)
--- a/drivers/staging/brcm80211/util/bcmutils.c
+++ b/drivers/staging/brcm80211/util/bcmutils.c
@@ -213,32 +213,6 @@ struct sk_buff *BCMFASTPATH pktq_pdeq_tail(struct pktq *pq, int prec)
        return p;
 }
 
-#ifdef BRCM_FULLMAC
-void pktq_pflush(struct pktq *pq, int prec, bool dir)
-{
-       struct pktq_prec *q;
-       struct sk_buff *p;
-
-       q = &pq->q[prec];
-       p = q->head;
-       while (p) {
-               q->head = p->prev;
-               p->prev = NULL;
-               pkt_buf_free_skb(p);
-               q->len--;
-               pq->len--;
-               p = q->head;
-       }
-       q->tail = NULL;
-}
-
-void pktq_flush(struct pktq *pq, bool dir)
-{
-       int prec;
-       for (prec = 0; prec < pq->num_prec; prec++)
-               pktq_pflush(pq, prec, dir);
-}
-#else /* !BRCM_FULLMAC */
 void
 pktq_pflush(struct pktq *pq, int prec, bool dir,
            ifpkt_cb_t fn, int arg)
@@ -278,7 +252,6 @@ void pktq_flush(struct pktq *pq, bool dir,
        for (prec = 0; prec < pq->num_prec; prec++)
                pktq_pflush(pq, prec, dir, fn, arg);
 }
-#endif /* BRCM_FULLMAC */
 
 void pktq_init(struct pktq *pq, int num_prec, int max_len)
 {