diff --git a/[refs] b/[refs] index 74661f0312db..5875194ca827 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c7914dec29f39a6a8ca348a5eeace40a59be65d +refs/heads/master: 7c3ee9e3fd065e878a2dbaec9d417441c59799be diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index dfab21e2e5dc..254b7daccee1 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -2724,8 +2724,9 @@ static int wl1271_op_sta_remove(struct ieee80211_hw *hw, } int wl1271_op_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - enum ieee80211_ampdu_mlme_action action, - struct ieee80211_sta *sta, u16 tid, u16 *ssn) + enum ieee80211_ampdu_mlme_action action, + struct ieee80211_sta *sta, u16 tid, u16 *ssn, + u8 buf_size) { struct wl1271 *wl = hw->priv; int ret;