Search Linux Wireless

Re: [PATCH] ath9k: Properly use unlikely check macro

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Mon, Nov 29, 2010 at 08:57:57PM +0530, Mohammed Shafi Shajakhan wrote:
> From: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
> 
> AUTOSLEEP feature is enabled only AR9003 and later chips.So unlikely
> macro should be used only to check whether auto-sleep feature is enabled
> 
> Signed-off-by: Mohammed Shafi Shajakhan <mshajakhan@xxxxxxxxxxx>
> ---
>  drivers/net/wireless/ath/ath9k/recv.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/ath/ath9k/recv.c b/drivers/net/wireless/ath/ath9k/recv.c
> index 262c815..751ee1b 100644
> --- a/drivers/net/wireless/ath/ath9k/recv.c
> +++ b/drivers/net/wireless/ath/ath9k/recv.c
> @@ -1743,10 +1743,10 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush, bool hp)
>  		}
>  
>  		spin_lock_irqsave(&sc->sc_pm_lock, flags);
> -		if (unlikely(ath9k_check_auto_sleep(sc) ||
> -			     (sc->ps_flags & (PS_WAIT_FOR_BEACON |
> +		if ((sc->ps_flags & (PS_WAIT_FOR_BEACON |
>  					      PS_WAIT_FOR_CAB |
> -					      PS_WAIT_FOR_PSPOLL_DATA))))
> +					      PS_WAIT_FOR_PSPOLL_DATA)) ||
> +				unlikely(ath9k_hw_check_auto_sleep(sc)))
>  			ath_rx_ps(sc, skb);
>  		spin_unlock_irqrestore(&sc->sc_pm_lock, flags);

What tree is this against?

-- 
John W. Linville		Someday the world will need a hero, and you
linville@xxxxxxxxxxxxx			might be all we have.  Be ready.
--
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


[Index of Archives]     [Linux Host AP]     [ATH6KL]     [Linux Bluetooth]     [Linux Netdev]     [Kernel Newbies]     [Linux Kernel]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Samba]     [Device Mapper]
  Powered by Linux