From 2f980292e04f4cc61ed9589bb7e76d09a8758da2 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Sun, 27 Feb 2011 21:54:14 +0100 Subject: [PATCH] --- yaml --- r: 236198 b: refs/heads/master c: c0365f04f65e2055caefbf0971d4f23969af47ee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bb3c96f55874..746de0527caa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f4728c386ce4f57affe6096b8d216bdd899958d6 +refs/heads/master: c0365f04f65e2055caefbf0971d4f23969af47ee diff --git a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c b/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c index 57c1789832a6..6059e4cc3aa1 100644 --- a/trunk/drivers/staging/brcm80211/brcmsmac/wl_mac80211.c +++ b/trunk/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;