Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[~andy/linux] / drivers / net / wireless / ath / ath9k / ar5008_phy.c

diff --git a/drivers/net/wireless/ath/ath9k/ar5008_phy.c b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
index 4bf9dab4f2b38b776d25d5226222be1f7bd36474..fac2c6da6ca4d14986120e0c8079d27ac584fda1 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2010 Atheros Communications Inc.
+ * Copyright (c) 2008-2011 Atheros Communications Inc.
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -627,6 +627,11 @@ static void ar5008_hw_init_bb(struct ath_hw *ah,
        else
                synthDelay /= 10;
 
+       if (IS_CHAN_HALF_RATE(chan))
+               synthDelay *= 2;
+       else if (IS_CHAN_QUARTER_RATE(chan))
+               synthDelay *= 4;
+
        REG_WRITE(ah, AR_PHY_ACTIVE, AR_PHY_ACTIVE_EN);
 
        udelay(synthDelay + BASE_ACTIVATE_DELAY);