From: Javier Martinez Canillas Date: Sun, 27 Feb 2011 20:54:14 +0000 (+0100) Subject: staging: brcm80211: Add buf_size parameter to ampdu_action handler function X-Git-Tag: MMI-PSA29.97-13-9~20521^2~347 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c0365f04f65e2055caefbf0971d4f23969af47ee;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git staging: brcm80211: Add buf_size parameter to ampdu_action handler function struct ieee80211_ops.ampdu_action function pointer definition now includes a u8 buf_size parameter. Update wl_ops_ampdu_action handler function according to this new signature. Signed-off-by: Javier Martinez Canillas Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 57c1789832a6..6059e4cc3aa1 100644 --- a/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c @@ -149,7 +149,8 @@ static int wl_ops_sta_remove(struct ieee80211_hw *hw, struct ieee80211_vif *vif, static int wl_ops_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, u16 tid, u16 *ssn); + struct ieee80211_sta *sta, u16 tid, u16 *ssn, + u8 buf_size); static void wl_ops_rfkill_poll(struct ieee80211_hw *hw); static int wl_ops_tx(struct ieee80211_hw *hw, struct sk_buff *skb) @@ -617,7 +618,8 @@ static int wl_ops_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, u16 tid, u16 *ssn) + struct ieee80211_sta *sta, u16 tid, u16 *ssn, + u8 buf_size) { #if defined(BCMDBG) struct scb *scb = (struct scb *)sta->drv_priv;