diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-14 10:58:37 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2008-10-31 19:00:16 -0400 |
commit | ae5eb02641233a4e9d1b92d22090f1b1afa14466 (patch) | |
tree | 117b7cb5efa3ff1cf714218098fc6db3820ed4e0 /drivers/net/wireless/ath9k/recv.c | |
parent | bda3933a8aceedd03e0dd410844bd310033ca756 (diff) |
mac80211: rewrite HT handling
The HT handling has the following deficiencies, which I've
(partially) fixed:
* it always uses the AP info even if there is no AP,
hence has no chance of working as an AP
* it pretends to be HW config, but really is per-BSS
* channel sanity checking is left to the drivers
* it generally lets the driver control too much
HT enabling is still wrong with this patch if you have more than
one virtual STA mode interface, but that never happens currently.
Once WDS, IBSS or AP/VLAN gets HT capabilities, it will also be
wrong, see the comment in ieee80211_enable_ht().
Additionally, this fixes a number of bugs:
* mac80211: ieee80211_set_disassoc doesn't notify the driver any
more since the refactoring
* iwl-agn-rs: always uses the HT capabilities from the wrong stuff
mac80211 gives it rather than the actual peer STA
* ath9k: a number of bugs resulting from the broken HT API
I'm not entirely happy with putting the HT capabilities into
struct ieee80211_sta as restricted to our own HT TX capabilities,
but I see no cleaner solution for now.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath9k/recv.c')
-rw-r--r-- | drivers/net/wireless/ath9k/recv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/ath9k/recv.c b/drivers/net/wireless/ath9k/recv.c index 010fcdfec3f6..828322840a86 100644 --- a/drivers/net/wireless/ath9k/recv.c +++ b/drivers/net/wireless/ath9k/recv.c | |||
@@ -720,12 +720,11 @@ void ath_flushrecv(struct ath_softc *sc) | |||
720 | 720 | ||
721 | int ath_rx_input(struct ath_softc *sc, | 721 | int ath_rx_input(struct ath_softc *sc, |
722 | struct ath_node *an, | 722 | struct ath_node *an, |
723 | int is_ampdu, | ||
724 | struct sk_buff *skb, | 723 | struct sk_buff *skb, |
725 | struct ath_recv_status *rx_status, | 724 | struct ath_recv_status *rx_status, |
726 | enum ATH_RX_TYPE *status) | 725 | enum ATH_RX_TYPE *status) |
727 | { | 726 | { |
728 | if (is_ampdu && (sc->sc_flags & SC_OP_RXAGGR)) { | 727 | if (sc->sc_flags & SC_OP_RXAGGR) { |
729 | *status = ATH_RX_CONSUMED; | 728 | *status = ATH_RX_CONSUMED; |
730 | return ath_ampdu_input(sc, an, skb, rx_status); | 729 | return ath_ampdu_input(sc, an, skb, rx_status); |
731 | } else { | 730 | } else { |