From de2a6f53e020b29f5a6b39cc02a0831a842a09ce Mon Sep 17 00:00:00 2001 From: Clemens Noss Date: Sun, 15 May 2011 22:50:46 +0200 Subject: [PATCH] --- yaml --- r: 249721 b: refs/heads/master c: aacd531df9b88f7419e22708f72a476030863efe h: refs/heads/master i: 249719: 59896f22f56ad172309a5ceff313e2313358ac1e v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c | 3 +-- trunk/drivers/staging/brcm80211/include/bcmutils.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d0517e7466d8..276e86bc2d48 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84067de664ee6adba8c373e4298d755abd783b24 +refs/heads/master: aacd531df9b88f7419e22708f72a476030863efe diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index b007feb06435..85ad70096056 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/trunk/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/trunk/drivers/staging/brcm80211/include/bcmutils.h b/trunk/drivers/staging/brcm80211/include/bcmutils.h index ace9561a36a2..17683f2f785f 100644 --- a/trunk/drivers/staging/brcm80211/include/bcmutils.h +++ b/trunk/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 */