From patchwork Tue Jun 7 13:10:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Berg X-Patchwork-Id: 9161147 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E5DBF60571 for ; Tue, 7 Jun 2016 13:10:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D4C9022A2A for ; Tue, 7 Jun 2016 13:10:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7C3A281FE; Tue, 7 Jun 2016 13:10:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0146622A2A for ; Tue, 7 Jun 2016 13:10:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932608AbcFGNKN (ORCPT ); Tue, 7 Jun 2016 09:10:13 -0400 Received: from s3.sipsolutions.net ([5.9.151.49]:45941 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932584AbcFGNKK (ORCPT ); Tue, 7 Jun 2016 09:10:10 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.87) (envelope-from ) id 1bAGlk-0007aI-KI; Tue, 07 Jun 2016 15:10:08 +0200 From: Benjamin Berg To: linux-wireless@vger.kernel.org Cc: Kalle Valo , Felix Fietkau , ath9k-devel@lists.ath9k.org, Benjamin Berg Subject: [PATCH 5/6] ath9k: Use defined constants consistently. Date: Tue, 7 Jun 2016 15:10:00 +0200 Message-Id: <1465305001-26067-5-git-send-email-benjamin@sipsolutions.net> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465305001-26067-1-git-send-email-benjamin@sipsolutions.net> References: <1465305001-26067-1-git-send-email-benjamin@sipsolutions.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Benjamin Berg Signed-off-by: Benjamin Berg --- drivers/net/wireless/ath/ath9k/main.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c index f2ebc85..6a81298 100644 --- a/drivers/net/wireless/ath/ath9k/main.c +++ b/drivers/net/wireless/ath/ath9k/main.c @@ -1785,9 +1785,10 @@ static void ath9k_bss_info_changed(struct ieee80211_hw *hw, if ((avp->chanctx == sc->cur_chan) && (changed & BSS_CHANGED_ERP_SLOT)) { if (bss_conf->use_short_slot) - slottime = 9; + slottime = ATH9K_SLOT_TIME_9; else - slottime = 20; + slottime = ATH9K_SLOT_TIME_20; + if (vif->type == NL80211_IFTYPE_AP) { /* * Defer update, so that connected stations can adjust