Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: chromeos/compat-wireless/net/mac80211/agg-rx.c

Issue 5326002: Update compat-wireless to 2.6.36-5-spn (Closed) Base URL: http://git.chromium.org/git/kernel.git@master
Patch Set: Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chromeos/compat-wireless/net/mac80211/agg-rx.c
diff --git a/chromeos/compat-wireless/net/mac80211/agg-rx.c b/chromeos/compat-wireless/net/mac80211/agg-rx.c
index 32ee0969211e530e12efe4e283a2be4d48aa74a3..965b272499fd7616e4df039e3c878dda678f5cf9 100644
--- a/chromeos/compat-wireless/net/mac80211/agg-rx.c
+++ b/chromeos/compat-wireless/net/mac80211/agg-rx.c
@@ -56,7 +56,7 @@ static void ieee80211_free_tid_rx(struct rcu_head *h)
}
void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
- u16 initiator, u16 reason, bool tx)
+ u16 initiator, u16 reason)
{
struct ieee80211_local *local = sta->local;
struct tid_ampdu_rx *tid_rx;
@@ -81,7 +81,7 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
"aggregation for tid %d\n", tid);
/* check if this is a self generated aggregation halt */
- if (initiator == WLAN_BACK_RECIPIENT && tx)
+ if (initiator == WLAN_BACK_RECIPIENT)
ieee80211_send_delba(sta->sdata, sta->sta.addr,
tid, 0, reason);
@@ -91,10 +91,10 @@ void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
}
void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid,
- u16 initiator, u16 reason, bool tx)
+ u16 initiator, u16 reason)
{
mutex_lock(&sta->ampdu_mlme.mtx);
- ___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, tx);
+ ___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason);
mutex_unlock(&sta->ampdu_mlme.mtx);
}

Powered by Google App Engine
This is Rietveld 408576698