Re: [PATCH 17/24] ath6kl: add main.c

[Joe Perches <joe@perches.com>]

On Wed, 2011-07-13 at 04:35 +0300, Kalle Valo wrote:
> Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
> ---
>  drivers/net/wireless/ath/ath6kl/main.c | 1337 ++++++++++++++++++++++++++++++++

> +static void ath6kl_add_new_sta(struct ath6kl *ar, u8 *mac, u16 aid, u8 *wpaie,
> +			u8 ielen, u8 keymgmt, u8 ucipher, u8 auth)
> +{
> +	u8 free_slot;
> +
> +	free_slot = aid - 1;
> +	memcpy(ar->sta_list[free_slot].mac, mac, ETH_ALEN);
> +	memcpy(ar->sta_list[free_slot].wpa_ie, wpaie, ielen);


Many versions of gcc do not optimize these repeated dereferences.
It's better to use a temporary local.

	struct ath6kl_sta *sta = &ar->sta_list[free_slot];

	memcpy(sta->mac, mac, ETH_ALEN);
	memcpy(sta->wpa_ie, wpaie, ielen);

	etc..

> +static void ath6kl_sta_cleanup(struct ath6kl *ar, u8 i)
> +{
> +	/* empty the queued pkts in the PS queue if any */
> +	spin_lock_bh(&ar->sta_list[i].psq_lock);
> +	skb_queue_purge(&ar->sta_list[i].psq);
> +	spin_unlock_bh(&ar->sta_list[i].psq_lock);
> +
> +	memset(&ar->ap_stats.sta[ar->sta_list[i].aid - 1], 0,

here too.

> +	       sizeof(struct wmi_per_sta_stat));
> +	memset(&ar->sta_list[i].mac, 0, ETH_ALEN);
> +	memset(&ar->sta_list[i].wpa_ie, 0, IEEE80211_MAX_IE);
> +	ar->sta_list[i].aid = 0;
> +	ar->sta_list[i].sta_flags = 0;
> +
> +	ar->sta_list_index = ar->sta_list_index & ~(1 << i);
> +
> +}
[]
> +void ath6kl_tgt_stats_event(struct ath6kl *ar, u8 *ptr, u32 len)
> +{
> +	struct wmi_ap_mode_stat *p = (struct wmi_ap_mode_stat *) ptr;
> +	struct wmi_ap_mode_stat *ap = &ar->ap_stats;
> +	u8 ac;
> +
> +	if (ar->nw_type == AP_NETWORK) {
> +		if (len < sizeof(*p))
> +			return;
> +
> +		for (ac = 0; ac < AP_MAX_NUM_STA; ac++) {
> +			ath6kl_add_le32(&ap->sta[ac].tx_bytes,
> +					p->sta[ac].tx_bytes);

maybe better here to use temporaries too.

		struct ath6kl_sta *st_ap = &ap->sta[ac];
		struct ath6kl_sta *st_p = &p->sta[ac];

> +			ath6kl_add_le32(&ap->sta[ac].tx_pkts,
> +					p->sta[ac].tx_pkts);
> +			ath6kl_add_le32(&ap->sta[ac].tx_error,
> +					p->sta[ac].tx_error);

			ath6kl_add_le32(st_ap->tx_pkts, st_p->tx_pkts);
			ath6kl_add_le32(st_ap->tx_error, st_p->tx_error);

etc.