diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-09-04 13:08:24 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-09-04 13:08:24 -0400 |
| commit | 190355cc06eb4b3e2d3f06a8f7ba5ea433d77998 (patch) | |
| tree | 2c9694d607973f23691227d388bb861f573d37c6 /net/mac80211/iface.c | |
| parent | c66517165610b911e4c6d268f28d8c640832dbd1 (diff) | |
| parent | 14b058bbce9279ee432f0944ca14df69f4a0d170 (diff) | |
| download | op-kernel-dev-190355cc06eb4b3e2d3f06a8f7ba5ea433d77998.zip op-kernel-dev-190355cc06eb4b3e2d3f06a8f7ba5ea433d77998.tar.gz | |
Merge tag 'mac80211-for-john-2014-08-29' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
Johannes Berg <johannes@sipsolutions.net> says:
"Here are a few fixes for mac80211. One has been discussed for a while
and adds a terminating NUL-byte to the alpha2 sent to userspace, which
shouldn't be necessary but since many places treat it as a string we
couldn't move to just sending two bytes.
In addition to that, we have two VLAN fixes from Felix, a mesh fix, a
fix for the recently introduced RX aggregation offload, a revert for
a broken patch (that luckily didn't really cause any harm) and a small
fix for alignment in debugfs."
Signed-off-by: John W. Linville <linville@redhat.com>
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 01eede7..f75e5f1 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1175,8 +1175,8 @@ static void ieee80211_iface_work(struct work_struct *work) if (sta) { u16 last_seq; - last_seq = le16_to_cpu( - sta->last_seq_ctrl[rx_agg->tid]); + last_seq = IEEE80211_SEQ_TO_SN(le16_to_cpu( + sta->last_seq_ctrl[rx_agg->tid])); __ieee80211_start_rx_ba_session(sta, 0, 0, |
