Merge branch 'for-2.6.33' of git://git.kernel.dk/linux-2.6-block

[~andy/linux] / net / mac80211 / driver-ops.h

diff --git a/net/mac80211/driver-ops.h b/net/mac80211/driver-ops.h
index 020a94a31106ab6668166203601d4a6fb12be384..921dd9c9ff6225c8d7b942053313530ca8a3e666 100644 (file)
--- a/net/mac80211/driver-ops.h
+++ b/net/mac80211/driver-ops.h
@@ -239,15 +239,16 @@ static inline int drv_tx_last_beacon(struct ieee80211_local *local)
 }
 
 static inline int drv_ampdu_action(struct ieee80211_local *local,
+                                  struct ieee80211_vif *vif,
                                   enum ieee80211_ampdu_mlme_action action,
                                   struct ieee80211_sta *sta, u16 tid,
                                   u16 *ssn)
 {
        int ret = -EOPNOTSUPP;
        if (local->ops->ampdu_action)
-               ret = local->ops->ampdu_action(&local->hw, action,
+               ret = local->ops->ampdu_action(&local->hw, vif, action,
                                               sta, tid, ssn);
-       trace_drv_ampdu_action(local, action, sta, tid, ssn, ret);
+       trace_drv_ampdu_action(local, vif, action, sta, tid, ssn, ret);
        return ret;
 }