On Sat, Dec 1, 2012 at 9:21 PM, Bernhard Urban <lewurm@xxxxxxxxx> wrote: > add an if-guard, otherwise iw(8) reports weird signal strengths. > > The behaviour was fine before this commit: > 7c277349ecbd66e19fad3d949fa6ef6c131a3b62 > This patch is therefore a partially revert of it. > > Tested with "TP-Link TL-WN722N" > > Thanks to indoo.rs http://indoo.rs/ for sponsoring > > Reported-by: Markus Krainz <markus@xxxxxxxx> > Tested-by: Markus Krainz <markus@xxxxxxxx> > Signed-off-by: Bernhard Urban <lewurm@xxxxxxxxx> > --- > drivers/net/wireless/ath/ath9k/htc.h | 1 + > drivers/net/wireless/ath/ath9k/htc_drv_txrx.c | 29 +++++++++++++++---------- > 2 files changed, 19 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h > index 936e920..00ebf1c 100644 > --- a/drivers/net/wireless/ath/ath9k/htc.h > +++ b/drivers/net/wireless/ath/ath9k/htc.h > @@ -22,6 +22,7 @@ > #include <linux/firmware.h> > #include <linux/skbuff.h> > #include <linux/netdevice.h> > +#include <linux/etherdevice.h> > #include <linux/leds.h> > #include <linux/slab.h> > #include <net/mac80211.h> > diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c > index 47e61d0..8b4da3d 100644 > --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c > +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c > @@ -969,6 +969,7 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, > int hdrlen, padpos, padsize; > int last_rssi = ATH_RSSI_DUMMY_MARKER; > __le16 fc; > + u8 is_mybeacon; > > if (skb->len < HTC_RX_FRAME_HEADER_SIZE) { > ath_err(common, "Corrupted RX frame, dropping (len: %d)\n", > @@ -1060,22 +1061,28 @@ static bool ath9k_rx_prepare(struct ath9k_htc_priv *priv, > ath9k_process_rate(hw, rx_status, rxbuf->rxstatus.rs_rate, > rxbuf->rxstatus.rs_flags); > > - if (rxbuf->rxstatus.rs_rssi != ATH9K_RSSI_BAD && > - !rxbuf->rxstatus.rs_moreaggr) > - ATH_RSSI_LPF(priv->rx.last_rssi, > - rxbuf->rxstatus.rs_rssi); > + is_mybeacon = ieee80211_is_beacon(fc) && > + !is_zero_ether_addr(common->curbssid) && > + ether_addr_equal(hdr->addr3, common->curbssid); > > - last_rssi = priv->rx.last_rssi; > + if (is_mybeacon && priv->ah->opmode == NL80211_IFTYPE_STATION) { > + if (rxbuf->rxstatus.rs_rssi != ATH9K_RSSI_BAD && > + !rxbuf->rxstatus.rs_moreaggr) > + ATH_RSSI_LPF(priv->rx.last_rssi, > + rxbuf->rxstatus.rs_rssi); > > - if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER)) > - rxbuf->rxstatus.rs_rssi = ATH_EP_RND(last_rssi, > - ATH_RSSI_EP_MULTIPLIER); > + last_rssi = priv->rx.last_rssi; > > - if (rxbuf->rxstatus.rs_rssi < 0) > - rxbuf->rxstatus.rs_rssi = 0; > + if (likely(last_rssi != ATH_RSSI_DUMMY_MARKER)) { > + s8 rssi = ATH_EP_RND(last_rssi, ATH_RSSI_EP_MULTIPLIER); > + rxbuf->rxstatus.rs_rssi = rssi; > + } > + > + if (rxbuf->rxstatus.rs_rssi < 0) > + rxbuf->rxstatus.rs_rssi = 0; > > - if (ieee80211_is_beacon(fc)) > priv->ah->stats.avgbrssi = rxbuf->rxstatus.rs_rssi; > + } > > rx_status->mactime = be64_to_cpu(rxbuf->rxstatus.rs_tstamp); > rx_status->band = hw->conf.channel->band; > -- > 1.7.9.5 > I'm sending this patch again, because I'm not sure if I messed up something with my mail client in this reply: http://www.mail-archive.com/ath9k-devel@xxxxxxxxxxxxxxx/msg09470.html It doesn't show up on gmane for linux-wireless and I didn't get an answer so far. Thanks, Bernhard -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
