Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp1566828pxf; Fri, 2 Apr 2021 14:34:00 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxspsBydfd0AY6v+RNeg6ys2z7TwsL5Dc7Arr0fbvXZmtAVp5TP6ekbBDnNI9hZR3BCyblr X-Received: by 2002:aa7:d4d6:: with SMTP id t22mr17955421edr.376.1617399240156; Fri, 02 Apr 2021 14:34:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617399240; cv=none; d=google.com; s=arc-20160816; b=qQZiacCAxs9IXFDkI8B2+A5KfSb6I9TCCINK2TyK8yXB7zLaYr/pvQekX0tjt1OCuX 3QIUtpFmq6O9nlWqKeh5Am3q6fQuhfhO2dap+92Xld+OEt7QNQSPTh1rN3HznfzgOPE8 fnwe9F2AQhB8qqbbcAeBa5L55F5vJp3bF4jFg5VAv2qdOW6DUP4A8EmJd+lRN4aG1BN0 Uf+dyaTfL4ISg2P5sEYbTIrdkk+MRuI00P2vjBl11M/zC8/BtCK6SMcnAcWc48GVa8yO 1pVXOqysikYFGnD5VkAGToF+PS8JnSvCHQmhmhRrESzitT/5IZ64DFoQhteN/Ao3yp9T 7MbQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=Dal3dZN3EIH6sWr+Qb5S4WJM82W4JZVxXj9iv5zQ0Xs=; b=gy0KeveDYS11bOXwLDmc0PmB5Y7gGpndG4ixHNMLt8HnK3M9I7BigV6IpvRq6FyzqF wbrH1Aq88DfnM/ZjoyEdCbOC1bMKLUOBXs2zTNeAbRbT5ME9/o4efi+B4XNwkmzIe7xb IIfdmWKMM+W1A+QNg5tO3J148oPSW8bDM0Swae+kDt7ZHJo4D4fR/V8IRqRs9mCqyq3p 1PrUKanCfTnqgl4jVd+1RshghWqppCtR+P4YrAHYQ4qTlK/CR1xlr9vqEnJoQj6Ktp0Q llp5kmmoXv/jWVllADJaKlWdMAUdm33duVC/wXTG3HI98sohxRFjaZkMzMO+XE1Xqqpu vuZA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id d20si7236747eds.530.2021.04.02.14.33.33; Fri, 02 Apr 2021 14:34:00 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235636AbhDBVbK (ORCPT + 99 others); Fri, 2 Apr 2021 17:31:10 -0400 Received: from smtp01.smtpout.orange.fr ([80.12.242.123]:24338 "EHLO smtp.smtpout.orange.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231443AbhDBVbH (ORCPT ); Fri, 2 Apr 2021 17:31:07 -0400 Received: from localhost.localdomain ([90.126.11.170]) by mwinf5d36 with ME id nxX3240013g7mfN03xX31V; Fri, 02 Apr 2021 23:31:05 +0200 X-ME-Helo: localhost.localdomain X-ME-Auth: Y2hyaXN0b3BoZS5qYWlsbGV0QHdhbmFkb28uZnI= X-ME-Date: Fri, 02 Apr 2021 23:31:05 +0200 X-ME-IP: 90.126.11.170 From: Christophe JAILLET To: chunkeey@googlemail.com, kvalo@codeaurora.org, davem@davemloft.net, kuba@kernel.org Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, Christophe JAILLET Subject: [PATCH] carl9170: remove get_tid_h Date: Fri, 2 Apr 2021 23:31:00 +0200 Message-Id: <68efad7a597159e22771d37fc8b4a8a613866d60.1617399010.git.christophe.jaillet@wanadoo.fr> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org 'get_tid_h()' is the same as 'ieee80211_get_tid()'. So this function can be removed to save a few lines of code. Signed-off-by: Christophe JAILLET --- drivers/net/wireless/ath/carl9170/carl9170.h | 7 +------ drivers/net/wireless/ath/carl9170/tx.c | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/ath/carl9170/carl9170.h b/drivers/net/wireless/ath/carl9170/carl9170.h index 0d38100d6e4f..84a8ce0784b1 100644 --- a/drivers/net/wireless/ath/carl9170/carl9170.h +++ b/drivers/net/wireless/ath/carl9170/carl9170.h @@ -631,14 +631,9 @@ static inline u16 carl9170_get_seq(struct sk_buff *skb) return get_seq_h(carl9170_get_hdr(skb)); } -static inline u16 get_tid_h(struct ieee80211_hdr *hdr) -{ - return (ieee80211_get_qos_ctl(hdr))[0] & IEEE80211_QOS_CTL_TID_MASK; -} - static inline u16 carl9170_get_tid(struct sk_buff *skb) { - return get_tid_h(carl9170_get_hdr(skb)); + return ieee80211_get_tid(carl9170_get_hdr(skb)); } static inline struct ieee80211_vif * diff --git a/drivers/net/wireless/ath/carl9170/tx.c b/drivers/net/wireless/ath/carl9170/tx.c index 6b8446ff48c8..88444fe6d1c6 100644 --- a/drivers/net/wireless/ath/carl9170/tx.c +++ b/drivers/net/wireless/ath/carl9170/tx.c @@ -394,7 +394,7 @@ static void carl9170_tx_status_process_ampdu(struct ar9170 *ar, if (unlikely(!sta)) goto out_rcu; - tid = get_tid_h(hdr); + tid = ieee80211_get_tid(hdr); sta_info = (void *) sta->drv_priv; tid_info = rcu_dereference(sta_info->agg[tid]); -- 2.27.0