diff options
| author | Johan Hovold <johan@kernel.org> | 2014-09-15 12:07:37 -0400 |
|---|---|---|
| committer | Johan Hovold <johan@kernel.org> | 2014-09-15 12:10:34 -0400 |
| commit | 4b7154ba70bb20a3c024faabdd2bc207b550a813 (patch) | |
| tree | 99a6e1204ec5deaca27bcbfc75ca16d3633433f2 /net/mac80211/iface.c | |
| parent | adceac14166da8c466223a35ec59c4a4adeef976 (diff) | |
| parent | 9e82bf014195d6f0054982c463575cdce24292be (diff) | |
Merge tag 'v3.17-rc5' into usb-next
USB fixes in Linux 3.17-rc5 are needed to build on top of for 3.18.
Signed-off-by: Johan Hovold <johan@kernel.org>
Diffstat (limited to 'net/mac80211/iface.c')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 01eede7406a5..f75e5f132c5a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c | |||
| @@ -1175,8 +1175,8 @@ static void ieee80211_iface_work(struct work_struct *work) | |||
| 1175 | if (sta) { | 1175 | if (sta) { |
| 1176 | u16 last_seq; | 1176 | u16 last_seq; |
| 1177 | 1177 | ||
| 1178 | last_seq = le16_to_cpu( | 1178 | last_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu( |
| 1179 | sta->last_seq_ctrl[rx_agg->tid]); | 1179 | sta->last_seq_ctrl[rx_agg->tid])); |
| 1180 | 1180 | ||
| 1181 | __ieee80211_start_rx_ba_session(sta, | 1181 | __ieee80211_start_rx_ba_session(sta, |
| 1182 | 0, 0, | 1182 | 0, 0, |