From patchwork Fri Feb 19 10:43:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 8359341 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id EC05FC0553 for ; Fri, 19 Feb 2016 10:43:19 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id F2ADB2041D for ; Fri, 19 Feb 2016 10:43:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C9934203B5 for ; Fri, 19 Feb 2016 10:43:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2992793AbcBSKnQ (ORCPT ); Fri, 19 Feb 2016 05:43:16 -0500 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35874 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2992786AbcBSKnM (ORCPT ); Fri, 19 Feb 2016 05:43:12 -0500 Received: by mail-wm0-f67.google.com with SMTP id a4so7277155wme.3 for ; Fri, 19 Feb 2016 02:43:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G2mpa7cRDaW8Ria/RhFe+mMoeJ+6Z8uj7wEfuxG49xU=; b=tVPMHbgCv9uzek1XkQ4+lBa4dtfF4vFc49/E3i3NQbFfFDqP9A670FjWHgqOZuENYX ENeSJEOQhcRf6MJ0oFu7yciC7D3yolu6/iT03WIryl4kzbJCHoL/54PG37hD3jSfxf+K GzEIFJENVrAceuwq/TQDHn78Lwm8KlcNls0A4JjI7ISUK52OMv+JJYq+Zvs3R1m1rLSs aJz5mIw8hqCyaYqePVMYjR0AM01W5ROmtasEx3n6UB5+jA6IiDESrHkp6Pck9+bmDrMG icdfs06Xo0DCawXyYuY1yqmUiKxE6kOjnoFdDO5C5SCuuSGAy2LxauBNRk8FqEE5nsut POZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G2mpa7cRDaW8Ria/RhFe+mMoeJ+6Z8uj7wEfuxG49xU=; b=a4hHSQc2DPd8FOt3y0EbbgC8r2fTvY+LsC1EfqWfXRGe7kxWxaeyRC56e2XeE0bHdz Gk53HbMwu5yIYn66hBIJvtAS7YnQR6YYYHV8WRl5x3TFMmEkG7f3EokRlst0r4IKtTS3 TC4XAzoHdvkvvVl/GxLqTTRffqAv9c2DnWx04TTgGrSAWiGOp/DjjYUoDYlyeZXfHf74 acR4ugTocN+caHfc479RpEhtEmbkM6yOdSuulZknd9bhbbhHINWskjQfQOATJv6N7TMw 0C6/kbsJA7PUiugTZ9J6RgOuQRrVXCmAt9dgOlDwlpwWNRNW/4e5asRLwAMSirVYEtCQ WJoQ== X-Gm-Message-State: AG10YOR8yYa7+gKX+ETx2uUro5uB4HB4aMZ8yphgFbZkjUbpIkAvHXCaT2fCVpQID491cg== X-Received: by 10.194.84.2 with SMTP id u2mr9290673wjy.61.1455878590629; Fri, 19 Feb 2016 02:43:10 -0800 (PST) Received: from localhost.localdomain (net-188-152-170-117.cust.dsl.teletu.it. [188.152.170.117]) by smtp.gmail.com with ESMTPSA id ei9sm10607100wjd.40.2016.02.19.02.43.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 19 Feb 2016 02:43:09 -0800 (PST) From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [PATCH v2 2/2] mac80211: parse VHT info in injected frames Date: Fri, 19 Feb 2016 11:43:05 +0100 Message-Id: <1455878585-5525-3-git-send-email-lorenzo.bianconi83@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455878585-5525-1-git-send-email-lorenzo.bianconi83@gmail.com> References: <1455878585-5525-1-git-send-email-lorenzo.bianconi83@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap(). That capability has been tested using a d-link dir-860l rev b1 running OpenWrt trunk and mt76 driver Signed-off-by: Lorenzo Bianconi --- Documentation/networking/mac80211-injection.txt | 10 ++++++++ net/mac80211/tx.c | 31 +++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/Documentation/networking/mac80211-injection.txt b/Documentation/networking/mac80211-injection.txt index ec8f934..ef57cc0 100644 --- a/Documentation/networking/mac80211-injection.txt +++ b/Documentation/networking/mac80211-injection.txt @@ -45,6 +45,16 @@ radiotap headers and used to control injection: number of retries when either IEEE80211_RADIOTAP_RATE or IEEE80211_RADIOTAP_MCS was used + * IEEE80211_RADIOTAP_VHT + + VHT rate for the transmission (only for devices without own rate control). + Also some flags are parsed + + IEEE80211_TX_RC_SHORT_GI: use short guard interval + IEEE80211_TX_RC_40_MHZ_WIDTH: send in HT40 mode + IEEE80211_TX_RC_80_MHZ_WIDTH: send in HT80 mode + IEEE80211_TX_RC_160_MHZ_WIDTH: send in HT160 mode + The injection code can also skip all other currently defined radiotap fields facilitating replay of captured radiotap headers directly. diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7bb67fa..17db889 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1692,6 +1692,8 @@ static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local, u8 rate_retries = 0; u16 rate_flags = 0; u8 mcs_known, mcs_flags; + u16 vht_known; + u8 vht_mcs = 0, vht_nss = 0; int i; info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT | @@ -1772,6 +1774,32 @@ static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local, rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH; break; + case IEEE80211_RADIOTAP_VHT: + vht_known = get_unaligned_le16(iterator.this_arg); + rate_found = true; + + rate_flags = IEEE80211_TX_RC_VHT_MCS; + if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) && + (iterator.this_arg[2] & + IEEE80211_RADIOTAP_VHT_FLAG_SGI)) + rate_flags |= IEEE80211_TX_RC_SHORT_GI; + if (vht_known & + IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) { + if (iterator.this_arg[3] == 1) + rate_flags |= + IEEE80211_TX_RC_40_MHZ_WIDTH; + else if (iterator.this_arg[3] == 4) + rate_flags |= + IEEE80211_TX_RC_80_MHZ_WIDTH; + else if (iterator.this_arg[3] == 11) + rate_flags |= + IEEE80211_TX_RC_160_MHZ_WIDTH; + } + + vht_mcs = iterator.this_arg[4] >> 4; + vht_nss = iterator.this_arg[4] & 0xF; + break; + /* * Please update the file * Documentation/networking/mac80211-injection.txt @@ -1797,6 +1825,9 @@ static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local, if (rate_flags & IEEE80211_TX_RC_MCS) { info->control.rates[0].idx = rate; + } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) { + ieee80211_rate_set_vht(info->control.rates, vht_mcs, + vht_nss); } else { for (i = 0; i < sband->n_bitrates; i++) { if (rate * 5 != sband->bitrates[i].bitrate)