From patchwork Thu Dec 20 01:44:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 1905811 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D508BDFB79 for ; Sat, 22 Dec 2012 14:53:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751413Ab2LVOxQ (ORCPT ); Sat, 22 Dec 2012 09:53:16 -0500 Received: from mail-we0-f178.google.com ([74.125.82.178]:38566 "EHLO mail-we0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751238Ab2LVOxP (ORCPT ); Sat, 22 Dec 2012 09:53:15 -0500 Received: by mail-we0-f178.google.com with SMTP id x43so2595202wey.23 for ; Sat, 22 Dec 2012 06:53:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:in-reply-to:references:from:date:subject:to :cc; bh=aH9OFraKbfKfnENx9p/HVG37IKvMlkzNBYfZrTPg+GU=; b=kTQ8BiOL/aRmA62c/JKFIzpX3MYQCnev9WFXs+w3kZbAna+Wm7GiGnsO0Cp2Ey93wr lXK+4CuO+bLGvMAZmjJwcS14qPmcUkrqAnsYwXo6F8hJU39uj8O5cTtZG6fQYeeAxxeT uqgAX3IRwFKjqYCueMHNfCcEVibmrW5UaoZ+Qr6YCl+nFaQKvk+BEwn+LxOy+1u/tCRD EimbvriCfqJkHXggSOB1FKFaITN6xrJqbOsFxEPNw6ovWbvqq2ocn2DvB1ASBgB8dZ/3 +9ufoSTJuwua0I3tJItLbqWFhcrnHKSh3GJrcuf+KbHdjqS6XvCJ4MgM8SNo8NhtYwWG umTQ== X-Received: by 10.180.96.41 with SMTP id dp9mr26992568wib.8.1356187571210; Sat, 22 Dec 2012 06:46:11 -0800 (PST) Received: from debian64.localnet (pD9F88B3A.dip.t-dialin.net. [217.248.139.58]) by mx.google.com with ESMTPS id t17sm23558597wiv.6.2012.12.22.06.46.09 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Dec 2012 06:46:10 -0800 (PST) Received: from localhost ([127.0.0.1] helo=debian64.localnet ident=chuck) by debian64.localnet with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1TmQL1-0004Aa-7e; Sat, 22 Dec 2012 15:46:07 +0100 Message-Id: <078ea2f0ee742e6e3c0737a52649fb9e90d3bd69.1356186145.git.chunkeey@googlemail.com> In-Reply-To: <8f92b38a456c1dd901ce2022fcb66609a5b8ac4b.1356186145.git.chunkeey@googlemail.com> References: <8f92b38a456c1dd901ce2022fcb66609a5b8ac4b.1356186145.git.chunkeey@googlemail.com> From: Christian Lamparter Date: Thu, 20 Dec 2012 02:44:29 +0100 Subject: [PATCH 7/8] carl9170: remove custom NUM_TID and friends To: linux-wireless@vger.kernel.org Cc: linville@tuxdriver.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The commit: "mac80211: introduce IEEE80211_NUM_TIDS and use it" introduced a generic NUM_TID definitions for all everyone. Signed-off-by: Christian Lamparter --- drivers/net/wireless/ath/carl9170/carl9170.h | 18 ++++++------------ drivers/net/wireless/ath/carl9170/main.c | 4 ++-- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index c77874c..2559974 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h @@ -85,20 +85,14 @@ enum carl9170_device_state { CARL9170_STARTED, }; -#define CARL9170_NUM_TID 16 #define WME_BA_BMP_SIZE 64 #define CARL9170_TX_USER_RATE_TRIES 3 -#define WME_AC_BE 2 -#define WME_AC_BK 3 -#define WME_AC_VI 1 -#define WME_AC_VO 0 - #define TID_TO_WME_AC(_tid) \ - ((((_tid) == 0) || ((_tid) == 3)) ? WME_AC_BE : \ - (((_tid) == 1) || ((_tid) == 2)) ? WME_AC_BK : \ - (((_tid) == 4) || ((_tid) == 5)) ? WME_AC_VI : \ - WME_AC_VO) + ((((_tid) == 0) || ((_tid) == 3)) ? IEEE80211_AC_BE : \ + (((_tid) == 1) || ((_tid) == 2)) ? IEEE80211_AC_BK : \ + (((_tid) == 4) || ((_tid) == 5)) ? IEEE80211_AC_VI : \ + IEEE80211_AC_VO) #define SEQ_DIFF(_start, _seq) \ (((_start) - (_seq)) & 0x0fff) @@ -494,8 +488,8 @@ struct carl9170_sta_info { bool sleeping; atomic_t pending_frames; unsigned int ampdu_max_len; - struct carl9170_sta_tid __rcu *agg[CARL9170_NUM_TID]; - struct carl9170_ba_stats stats[CARL9170_NUM_TID]; + struct carl9170_sta_tid __rcu *agg[IEEE80211_NUM_TIDS]; + struct carl9170_ba_stats stats[IEEE80211_NUM_TIDS]; }; struct carl9170_tx_info { diff --git a/drivers/net/wireless/ath/carl9170/main.c b/drivers/net/wireless/ath/carl9170/main.c index 79888c9..717d14c 100644 --- a/drivers/net/wireless/ath/carl9170/main.c +++ b/drivers/net/wireless/ath/carl9170/main.c @@ -1330,7 +1330,7 @@ static int carl9170_op_sta_add(struct ieee80211_hw *hw, return 0; } - for (i = 0; i < CARL9170_NUM_TID; i++) + for (i = 0; i < ARRAY_SIZE(sta_info->agg); i++) RCU_INIT_POINTER(sta_info->agg[i], NULL); sta_info->ampdu_max_len = 1 << (3 + sta->ht_cap.ampdu_factor); @@ -1354,7 +1354,7 @@ static int carl9170_op_sta_remove(struct ieee80211_hw *hw, sta_info->ht_sta = false; rcu_read_lock(); - for (i = 0; i < CARL9170_NUM_TID; i++) { + for (i = 0; i < ARRAY_SIZE(sta_info->agg); i++) { struct carl9170_sta_tid *tid_info; tid_info = rcu_dereference(sta_info->agg[i]);