From: Reinette Chatre <reinette.chatre@intel.com>
Date: Fri, 25 Jun 2010 21:47:02 +0000 (-0700)
Subject: Merge branch 'wireless-2.6' into wireless-next-2.6
X-Git-Tag: v2.6.36-rc1~571^2~107^2~149
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e691e19e05c2cef72cd7f81bcae4195c81d4bf51;p=platform%2Fkernel%2Flinux-stable.git

Merge branch 'wireless-2.6' into wireless-next-2.6
---

e691e19e05c2cef72cd7f81bcae4195c81d4bf51
diff --cc drivers/net/wireless/ath/ath9k/main.c
index 87356fc,1e2a68e..efbf535
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@@ -450,8 -335,11 +450,12 @@@ set_timer
  
  static void ath_start_ani(struct ath_common *common)
  {
 +	struct ath_hw *ah = common->ah;
  	unsigned long timestamp = jiffies_to_msecs(jiffies);
+ 	struct ath_softc *sc = (struct ath_softc *) common->priv;
+ 
+ 	if (!(sc->sc_flags & SC_OP_ANI_RUN))
+ 		return;
  
  	common->ani.longcal_timer = timestamp;
  	common->ani.shortcal_timer = timestamp;