On Thu, Jul 29, 2010 at 5:56 AM, Vasanthakumar Thiagarajan
<vasanth@xxxxxxxxxxx> wrote:
> This algorithm chooses the best main and alt lna out of
> LNA1, LNA2, LNA1+LNA2 and LNA1-LNA2 to improve rx for single
> chain chips(AR9285). This would greatly improve rx when there
> is only one antenna is connected with AR9285.
>
> Signed-off-by: Vasanthakumar Thiagarajan <vasanth@xxxxxxxxxxx>
> diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
> index 243c177..8b4e4a6 100644
> --- a/drivers/net/wireless/ath/ath9k/init.c
> +++ b/drivers/net/wireless/ath/ath9k/init.c
> @@ -531,6 +531,11 @@ static void ath9k_init_misc(struct ath_softc *sc)
> sc->beacon.bslot[i] = NULL;
> sc->beacon.bslot_aphy[i] = NULL;
> }
> +
> + if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB) {
> + memset(&sc->ant_comb, 0, sizeof(struct ath_ant_comb));
I do not believe this memset is required since we kzalloc()'d the ah struct.
> + sc->ant_comb.count = ATH_ANT_DIV_COMB_INIT_COUNT;
> + }
> }
>
> static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid,
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index da0cfe9..711e8d2 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -1073,6 +1073,534 @@ static void ath9k_rx_skb_postprocess(struct ath_common *common,
> rxs->flag &= ~RX_FLAG_DECRYPTED;
> }
>
> +/* Antenna diversity and combining */
> +static void ath_ant_comb_scan(struct ath_softc *sc, struct ath_rx_status *rs)
> +{
<-- snip -->
> + ath9k_hw_antdiv_comb_conf_get(sc->sc_ah, &div_ant_conf);
<-- snip -->
> + ath9k_hw_antdiv_comb_conf_set(sc->sc_ah, &div_ant_conf);
<-- snip -->
> +}
Wow this routine is pretty large. Could you split this up into a few
helpers which describe what they do ?
Also notice how this ended up calling ath9k_hw_antdiv_comb_conf_get()
and ath9k_hw_antdiv_comb_conf_set(), the only callers of those
routines, and this itself is done when:
> +
> int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
> {
> struct ath_buf *bf;
> @@ -1210,6 +1738,9 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
> PS_WAIT_FOR_PSPOLL_DATA))))
> ath_rx_ps(sc, skb);
>
> + if (ah->caps.hw_caps & ATH9K_HW_CAP_ANT_DIV_COMB)
> + ath_ant_comb_scan(sc, &rs);
> +
> ath_rx_send_to_mac80211(hw, sc, skb, rxs);
>
> requeue:
So the call currently really does not require to be abstracted away
unless we expect another 1x1 device where it will have its own set of
calls, eventually.
Luis
--
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
