ar9170: rework rxstream code
PATCH 1/1 ar9170: rework rxstream code
With this patch ar9170 is capable of receiving aggregated 802.11n frames and sniffing on most networks without having a "debug message overhead".
Signed-off-by Christian Lamparter <[email protected]>
---
John,
can you please queue "[PATCH] ar9170usb: fix hang on resume" for -2.6?
This patch is is a waayyy too intrusive and definitely need more -testing!
Regards,
Chr
---
drivers/net/wireless/ath/ar9170/ar9170.h +12 -0
@@ -89,10 +89,16 @@ enum ar9170_device_state { AR9170_ASSOCIATED, }; +struct ar9170_rxstream_mpdu_merge { +struct ar9170_rx_head plcp; +bool has_plcp; +}; +struct ar9170 {struct ieee80211_hw *hw;struct mutex mutex;enum ar9170_device_state state; +unsigned long bad_hw_nagger;int (*open)(struct ar9170 *);void (*stop)(struct ar9170 *);
@@ -120,6 +126,7 @@ struct ar9170 {u64 cur_mc_hash, want_mc_hash;u32 cur_filter, want_filter;unsigned int filter_changed; +unsigned int filter_state;bool sniffer_enabled;/* PHY */
@@ -159,6 +166,11 @@ struct ar9170 {struct sk_buff_head global_tx_status;struct sk_buff_head global_tx_status_waste;struct delayed_work tx_status_janitor; + +/* rxstream mpdu merge */ +struct ar9170_rxstream_mpdu_merge rx_mpdu; +struct sk_buff *rx_failover; +int rx_failover_missing; };struct ar9170_sta_info {
drivers/net/wireless/ath/ar9170/hw.h +9 -6
@@ -312,7 +312,7 @@ struct ar9170_rx_head {u8 plcp[12 ]; } __packed; -struct ar9170_rx_tail { +struct ar9170_rx_phystatus { union { struct { u8 rssi_ant0, rssi_ant1, rssi_ant2,
@@ -324,6 +324,9 @@ struct ar9170_rx_tail {u8 evm_stream0[6 ], evm_stream1[6 ];u8 phy_err; +} __packed; + +struct ar9170_rx_macstatus {u8 SAidx, DAidx;u8 error;u8 status;
@@ -339,7 +342,7 @@ struct ar9170_rx_tail {#define AR9170_RX_ENC_SOFTWARE 0x8 -static inline u8 ar9170_get_decrypt_type (struct ar9170_rx_tail *t) +static inline u8 ar9170_get_decrypt_type (struct ar9170_rx_macstatus *t) {return (t->SAidx &0xc0 ) >>4 | (t->DAidx &0xc0 ) >>6 ;
@@ -357,10 +360,9 @@ static inline u8 ar9170_get_decrypt_type(struct ar9170_rx_tail *t)#define AR9170_RX_STATUS_MPDU_MASK 0x30#define AR9170_RX_STATUS_MPDU_SINGLE 0x00 -#define AR9170_RX_STATUS_MPDU_FIRST 0x10 -#define AR9170_RX_STATUS_MPDU_MIDDLE 0x20 -#define AR9170_RX_STATUS_MPDU_LAST 0x30 - +#define AR9170_RX_STATUS_MPDU_FIRST 0x20 +#define AR9170_RX_STATUS_MPDU_MIDDLE 0x30 +#define AR9170_RX_STATUS_MPDU_LAST 0x10#define AR9170_RX_ERROR_RXTO 0x01#define AR9170_RX_ERROR_OVERRUN 0x02
@@ -369,6 +371,7 @@ static inline u8 ar9170_get_decrypt_type(struct ar9170_rx_tail *t)#define AR9170_RX_ERROR_WRONG_RA 0x10#define AR9170_RX_ERROR_PLCP 0x20#define AR9170_RX_ERROR_MMIC 0x40 +#define AR9170_RX_ERROR_FATAL 0x80struct ar9170_cmd_tx_status {__le16 unkn;
drivers/net/wireless/ath/ar9170/main.c +400 -132
672 lines not on this page · raw message
drivers/net/wireless/ath/ar9170/main.c static void ar9170_handle_command_response(struct ar9170 *ar, · line 684
Quoted 5 lines · Christian Lamparter
drivers/net/wireless/ath/ar9170/main.c +5
-0+static void ar9170_handle_mpdu (struct ar9170 *ar,u8 *buf,int len) +{ +struct ar9170_rx_head *head; +struct ar9170_rx_macstatus *mac; +struct ar9170_rx_phystatus *phy;
Missing = NULL here for phy.
johannes
PATCH 1/1 ar9170: initialize phy data pointer variable
The patch "[PATCH] ar9170: rework rxstream code" left phy uninitialized, which could lead to crashes under certain conditions.
Reported-by Johannes Berg <[email protected]>
Signed-off-by Christian Lamparter <[email protected]>
---
drivers/net/wireless/ath/ar9170/main.c +1 -1
@@ -699,7 +699,7 @@ static void ar9170_handle_mpdu(struct ar9170 *ar, u8 *buf, int len) {struct ar9170_rx_head *head;struct ar9170_rx_macstatus *mac; -struct ar9170_rx_phystatus *phy; +struct ar9170_rx_phystatus *phy =NULL ;struct ieee80211_rx_status status;struct sk_buff *skb;int mpdu_len;