From aacd531df9b88f7419e22708f72a476030863efe Mon Sep 17 00:00:00 2001 From: Clemens Noss Date: Sun, 15 May 2011 22:50:46 +0200 Subject: [PATCH] staging: brcm80211: use correct pointer types in bcm_pktq_flush to clarify the intention: On Sun, May 15, 2011 at 09:54:26PM +0200, Arend van Spriel wrote: > On 05/15/2011 08:10 PM, Hauke Mehrtens wrote: [...] >> Why don't you use the correct pointer type here instead of casting then >> around and the parameter names are meaningless too. >> >> static bool cb_del_ampdu_pkt(struct sk_buff *mpdu, struct >> cb_del_ampdu_pars *ampdu_pars) [...] > Actually this is a generic callback mechanism in which an additional > parameter can be passed, which can be of *any* type hence a void pointer > seems justified here and a meaningless name is used. I do agree that the > txi parameter will always be a struct sk_buff and should be indicated as > such. Reported-by: Hauke Mehrtens Signed-off-by: Clemens Noss Acked-by: Roland Vossen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 3 +-- drivers/staging/brcm80211/include/bcmutils.h | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index b007feb..85ad700 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -1204,9 +1204,8 @@ 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, void *arg_a) +static bool cb_del_ampdu_pkt(struct sk_buff *mpdu, void *arg_a) { - struct sk_buff *mpdu = (struct sk_buff *)p; struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(mpdu); struct cb_del_ampdu_pars *ampdu_pars = (struct cb_del_ampdu_pars *)arg_a; diff --git a/drivers/staging/brcm80211/include/bcmutils.h b/drivers/staging/brcm80211/include/bcmutils.h index ace9561..17683f2 100644 --- a/drivers/staging/brcm80211/include/bcmutils.h +++ b/drivers/staging/brcm80211/include/bcmutils.h @@ -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 *, void *); +typedef bool(*ifpkt_cb_t) (struct sk_buff *, void *); /* operations on a specific precedence in packet queue */ -- 2.7.4