]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
mac80211: fix peer HT capabilities
authorJohannes Berg <johannes@sipsolutions.net>
Thu, 17 Dec 2009 12:55:48 +0000 (13:55 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 21 Dec 2009 16:32:27 +0000 (11:32 -0500)
commit9a418af5df03ad133cd8c8f6742b75e542db6392
treec439a797e8fa475e348763c544f0f3be57862b56
parent8585c2b896861aacd15337c3c7e58ad114e6cf60
mac80211: fix peer HT capabilities

I noticed yesterday, because Jeff had noticed
a speed regression, cf. bug
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2138
that the SM PS settings for peers were wrong.
Instead of overwriting the SM PS settings with
the local bits, we need to keep the remote bits.

The bug was part of the original HT code from
over two years ago, but unfortunately nobody
noticed that it makes no sense -- we shouldn't
be overwriting the peer's setting with our own
but rather keep it intact when masking the peer
capabilities with our own.

While fixing that, I noticed that the masking of
capabilities is completely useless for most of
the bits, so also fix those other bits.

Finally, I also noticed that PSMP_SUPPORT no
longer exists in the final 802.11n version, so
also remove that.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/rt2x00/rt2800lib.c
include/linux/ieee80211.h
net/mac80211/ht.c