ath9k_htc: use ath9k_cmn_beacon_config_adhoc

Signed-off-by: Oleksij Rempel <linux@rempel-privat.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
index 81237155a1e0b78a46e8c3609ea6d3a17fd1cfc5..50937d014542b37a4b7e9b412af37870a473a155 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
@@ -150,42 +150,21 @@ static void ath9k_htc_beacon_config_ap(struct ath9k_htc_priv *priv,
 }
 
 static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv,
-                                         struct ath_beacon_config *bss_conf)
+                                         struct ath_beacon_config *conf)
 {
        struct ath_hw *ah = priv->ah;
-       struct ath_common *common = ath9k_hw_common(ah);
-       u32 tsftu;
-       u64 tsf;
-
-       bss_conf->intval = bss_conf->beacon_interval;
-       bss_conf->nexttbtt = bss_conf->intval;
-
-       /*
-        * Pull nexttbtt forward to reflect the current TSF.
-        */
-       tsf = ath9k_hw_gettsf64(priv->ah);
-       tsftu = TSF_TO_TU(tsf >> 32, tsf) + FUDGE;
-       do {
-               bss_conf->nexttbtt += bss_conf->intval;
-       } while (bss_conf->nexttbtt < tsftu);
+       ah->imask = 0;
 
+       ath9k_cmn_beacon_config_adhoc(ah, conf);
        /*
         * Only one IBSS interfce is allowed.
         */
-       if (bss_conf->intval > DEFAULT_SWBA_RESPONSE)
-               priv->ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;
+       if (conf->intval >= TU_TO_USEC(DEFAULT_SWBA_RESPONSE))
+               ah->config.sw_beacon_response_time = DEFAULT_SWBA_RESPONSE;
        else
-               priv->ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
-
-       if (bss_conf->enable_beacon)
-               ah->imask = ATH9K_INT_SWBA;
-
-       ath_dbg(common, CONFIG,
-               "IBSS Beacon config, intval: %d, nexttbtt: %u, resp_time: %d, imask: 0x%x\n",
-               bss_conf->beacon_interval, bss_conf->nexttbtt,
-               priv->ah->config.sw_beacon_response_time, ah->imask);
+               ah->config.sw_beacon_response_time = MIN_SWBA_RESPONSE;
 
-       ath9k_htc_beacon_init(priv, bss_conf, bss_conf->ibss_creator);
+       ath9k_htc_beacon_init(priv, conf, conf->ibss_creator);
 }
 
 void ath9k_htc_beaconep(void *drv_priv, struct sk_buff *skb,