Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp3202268ybi; Sun, 14 Jul 2019 08:45:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqzoDe0mCxdX6C2aPf9rxjaL0brKyBKyojxnvoZGjXOyUROwQxygj+wp4jhJFUctr9BnuV/G X-Received: by 2002:a17:90a:d343:: with SMTP id i3mr25206765pjx.15.1563119106707; Sun, 14 Jul 2019 08:45:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563119106; cv=none; d=google.com; s=arc-20160816; b=H76g/iizJ6N48p79792zE5ngRHlrbE+T9Dl7iDcVQDUFgAF29xWjCFt1vVE1jJe/Xk 994pW6bu4HtLaanWo3st17X9X9Ff4Kb7zOBwA/zF7kXguS3nLCOEFekU2wRMORWdWA4i FUHfYVr831VPrQazoYnycOjZ/tmWlHqVeM8c30ofdsouUz6ORfm8cWsmtJpM+hJeQsS7 u+2L83c2TYA+sdrarGHxtXrNluOjst3ynWd9quV7IsajnNDiptauFVdQWzoJtxGox2Tz WrEFNyD0SBNqGx8bal0jyszsbNjTT587CARQE1p8MQku3BQXdllNzaixnFi0QKYiAIvK PIYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=OyA8ZSy+/6I1Yy8l6Ajxaiwsu9MinLP0TzeCJlSEEaI=; b=Rs7yosmZCx+vSK1XjDgi3Rf+CyNIbQ9+aGTDVVWHjj+t33kpmZW/cjqo01cDA8pcSh BJ0zBUZDI8lX6hUklNKg5VZvqCSMVxxFhfakMWrgnEZGt8TLEYR8knehYBTcmdqxEfUw AJqHm/lgqYOvbmTZfqco+UwLRgy4dbtBBRWndsF0CO9DxMzSlXv10kVSL2lcVsHJmzYC Kg5YSlO6uRQvxJHRHgfKZCxpImPidxPkM/9NEhRG00I+YGXp/ZVP1fVkDOPncYKL+SB2 MyD1yBxL7yVakbaocIFDCsf7/kueb8Un1XxHBB9JgjiHFEyKQLdMyLcP241SKBRh2Lnk QYCA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r185si13552120pgr.506.2019.07.14.08.44.41; Sun, 14 Jul 2019 08:45:06 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-wireless-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728376AbfGNPog (ORCPT + 99 others); Sun, 14 Jul 2019 11:44:36 -0400 Received: from nbd.name ([46.4.11.11]:59390 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728278AbfGNPog (ORCPT ); Sun, 14 Jul 2019 11:44:36 -0400 Received: from p5dcfb359.dip0.t-ipconnect.de ([93.207.179.89] helo=bertha.fritz.box) by ds12 with esmtpa (Exim 4.89) (envelope-from ) id 1hmgfx-0007cJ-GR; Sun, 14 Jul 2019 17:44:33 +0200 From: John Crispin To: Johannes Berg , Kalle Valo Cc: linux-wireless@vger.kernel.org, ath11k@lists.infradead.org, John Crispin Subject: [PATCH 2/6] mac80211: propagate struct ieee80211_tx_status into ieee80211_tx_monitor() Date: Sun, 14 Jul 2019 17:44:15 +0200 Message-Id: <20190714154419.11854-3-john@phrozen.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190714154419.11854-1-john@phrozen.org> References: <20190714154419.11854-1-john@phrozen.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org This will allow use to report HE rates on the radiotap interface. Signed-off-by: John Crispin --- net/mac80211/ieee80211_i.h | 3 ++- net/mac80211/status.c | 6 ++++-- net/mac80211/tx.c | 3 ++- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index db1c834d55d5..be06f51d7fa3 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -1776,7 +1776,8 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u32 info_flags); void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_supported_band *sband, - int retry_count, int shift, bool send_to_cooked); + int retry_count, int shift, bool send_to_cooked, + struct ieee80211_tx_status *status); void ieee80211_check_fast_xmit(struct sta_info *sta); void ieee80211_check_fast_xmit_all(struct ieee80211_local *local); diff --git a/net/mac80211/status.c b/net/mac80211/status.c index 0c8858c01e36..a3502da02b4e 100644 --- a/net/mac80211/status.c +++ b/net/mac80211/status.c @@ -648,7 +648,8 @@ static int ieee80211_tx_get_rates(struct ieee80211_hw *hw, void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb, struct ieee80211_supported_band *sband, - int retry_count, int shift, bool send_to_cooked) + int retry_count, int shift, bool send_to_cooked, + struct ieee80211_tx_status *status) { struct sk_buff *skb2; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); @@ -904,7 +905,8 @@ static void __ieee80211_tx_status(struct ieee80211_hw *hw, } /* send to monitor interfaces */ - ieee80211_tx_monitor(local, skb, sband, retry_count, shift, send_to_cooked); + ieee80211_tx_monitor(local, skb, sband, retry_count, shift, + send_to_cooked, status); } void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb) diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 173a8495820e..2395f7cf0be1 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -4794,7 +4794,8 @@ struct sk_buff *ieee80211_beacon_get_tim(struct ieee80211_hw *hw, if (!sband) return bcn; - ieee80211_tx_monitor(hw_to_local(hw), copy, sband, 1, shift, false); + ieee80211_tx_monitor(hw_to_local(hw), copy, sband, 1, shift, false, + NULL); return bcn; } -- 2.20.1