Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84067de6 authored by Clemens Noss's avatar Clemens Noss Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: fix cast to pointer from integer 



bcm_pktq_flush and related functions only ever get 0 or a pointer for
arg, so make it a pointer.

This might fix a crash on 64bit.

Signed-off-by: default avatarClemens Noss <cnoss@gmx.de>
Acked-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7a9aea51

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -2845,7 +2845,7 @@ void dhd_bus_stop(struct dhd_bus *bus, bool enforce_mutex) 
	dhdsdio_clkctl(bus, CLK_SDONLY, false);



	/* Clear the data packet queues */

	bcm_pktq_flush(&bus->txq, true, NULL, 0);

	bcm_pktq_flush(&bus->txq, true, NULL, NULL);



	/* Clear any held glomming stuff */

	if (bus->glomd)

drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c

+2 −2
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ void wlc_ampdu_shm_upd(struct ampdu_info *ampdu) 
/*

 * callback function that helps flushing ampdu packets from a priority queue

 */

static bool cb_del_ampdu_pkt(void *p, int arg_a)

static bool cb_del_ampdu_pkt(void *p, void *arg_a)

{

	struct sk_buff *mpdu = (struct sk_buff *)p;

	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(mpdu);
@@ -1248,7 +1248,7 @@ void wlc_ampdu_flush(struct wlc_info *wlc, 
	ampdu_pars.tid = tid;

	for (prec = 0; prec < pq->num_prec; prec++) {

		bcm_pktq_pflush(pq, prec, true, cb_del_ampdu_pkt,

			    (int)&ampdu_pars);

			    (void *)&ampdu_pars);

	}

	wlc_inval_dma_pkts(wlc->hw, sta, dma_cb_fn_ampdu);

}

drivers/staging/brcm80211/brcmsmac/wlc_main.c

+2 −2
Original line number Diff line number Diff line
@@ -2453,7 +2453,7 @@ uint wlc_down(struct wlc_info *wlc) 


	/* flush tx queues */

	for (qi = wlc->tx_queues; qi != NULL; qi = qi->next) {

		bcm_pktq_flush(&qi->q, true, NULL, 0);

		bcm_pktq_flush(&qi->q, true, NULL, NULL);

	}



	callbacks += wlc_bmac_down_finish(wlc->hw);
@@ -7519,7 +7519,7 @@ void wlc_wait_for_tx_completion(struct wlc_info *wlc, bool drop) 
{

	/* flush packet queue when requested */

	if (drop)

		bcm_pktq_flush(&wlc->pkt_queue->q, false, NULL, 0);

		bcm_pktq_flush(&wlc->pkt_queue->q, false, NULL, NULL);



	/* wait for queue and DMA fifos to run dry */

	while (!pktq_empty(&wlc->pkt_queue->q) ||

drivers/staging/brcm80211/include/bcmutils.h

+3 −3
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 
#define PKTQ_PREC_ITER(pq, prec)        for (prec = (pq)->num_prec - 1; prec >= 0; prec--)



/* fn(pkt, arg).  return true if pkt belongs to if */

	typedef bool(*ifpkt_cb_t) (void *, int);

	typedef bool(*ifpkt_cb_t) (void *, void *);



/* operations on a specific precedence in packet queue */
@@ -100,7 +100,7 @@ extern void bcm_pkt_buf_free_skb(struct sk_buff *skb); 


/* Empty the queue at particular precedence level */

extern void bcm_pktq_pflush(struct pktq *pq, int prec,

	bool dir, ifpkt_cb_t fn, int arg);

	bool dir, ifpkt_cb_t fn, void *arg);



/* operations on a set of precedences in packet queue */
@@ -127,7 +127,7 @@ extern void bcm_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 *bcm_pktq_peek_tail(struct pktq *pq, int *prec_out);

extern void bcm_pktq_flush(struct pktq *pq, bool dir,

	ifpkt_cb_t fn, int arg);

	ifpkt_cb_t fn, void *arg);



/* externs */

/* packet */

drivers/staging/brcm80211/util/bcmutils.c

+2 −2
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ EXPORT_SYMBOL(bcm_pktq_pdeq_tail); 


void

bcm_pktq_pflush(struct pktq *pq, int prec, bool dir,

	    ifpkt_cb_t fn, int arg)

	    ifpkt_cb_t fn, void *arg)

{

	struct pktq_prec *q;

	struct sk_buff *p, *prev = NULL;
@@ -263,7 +263,7 @@ bcm_pktq_pflush(struct pktq *pq, int prec, bool dir, 
EXPORT_SYMBOL(bcm_pktq_pflush);



void bcm_pktq_flush(struct pktq *pq, bool dir,

		ifpkt_cb_t fn, int arg)

		ifpkt_cb_t fn, void *arg)

{

	int prec;

	for (prec = 0; prec < pq->num_prec; prec++)