From patchwork Tue Feb 23 11:11:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 8390851 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 8F836C0553 for ; Tue, 23 Feb 2016 11:12:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9D915202EB for ; Tue, 23 Feb 2016 11:12:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A63EC20160 for ; Tue, 23 Feb 2016 11:12:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751751AbcBWLME (ORCPT ); Tue, 23 Feb 2016 06:12:04 -0500 Received: from mail-wm0-f68.google.com ([74.125.82.68]:35562 "EHLO mail-wm0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119AbcBWLMD (ORCPT ); Tue, 23 Feb 2016 06:12:03 -0500 Received: by mail-wm0-f68.google.com with SMTP id g62so21269231wme.2 for ; Tue, 23 Feb 2016 03:12:02 -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; bh=G2mpa7cRDaW8Ria/RhFe+mMoeJ+6Z8uj7wEfuxG49xU=; b=LYLYMKOP2s8JOUvXWZsuz674m8YDVdMKcR80B6dqeMKSYQObVupq1d7BwYCL6ReNyg Gbk9xIBOxjo9XWnBe5NgcpZCSWj5TffIAaDxFSXnJLwW/7teOYMa+ZnlWUoahQZegwuW OqxN+D6v8Sfe3tuA3uqeJkByJbju8oug26EM+u/XHm5iZEMXhvjAwpJ7MXh3/8zY7e5b /lE63OjweZwel3brQ//0Xk6FzFQvggEfOoAhm+O6pv1/g6cWYst4bhA/hIyemTvPLUas 0kunh0nL79D9DemD53lDL6t6yPjcmm6LbBzap0Z73/TD3bwIfh+1384kv50xNWXuIS2R YsZA== 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; bh=G2mpa7cRDaW8Ria/RhFe+mMoeJ+6Z8uj7wEfuxG49xU=; b=ey3lhYyKLuMqLA1QUmb6jleEE3zLc1RZEAwzKuMm3WOrV1pv2Z7K/OCNy0bS6JNm3y 1hgn1k92kjAsbGb+QYp/o5cWTUzWYAcSOD5uSYd7d7nHQ1ftiWk7oJpDGdqOVS8iryTr oCCiHSHZdmAsELfBUuT8ehzpHh8ffj/c3HZWj8zHRpPf7j+Eht+FfUOx7yjHi0G7hZum rw8Y2i6kU3g76U3DVNJcDyT7lw642kOZVu4KpxgXDVaQQbhd/4xEjv0tYzwrd05bcGvo NyboeNb/ISISpk8y9zSwUoEAi1srPjSIgYfPO3fkeUucaE4HqtdBNu/irjZvKqTt6Bdy flng== X-Gm-Message-State: AG10YOSZR3iqGcuoP9jnzDU03e+pLBwS+XPmchuxUHTbANxJ7RiNv5C8UvCMK/MG/A6Bwg== X-Received: by 10.28.140.202 with SMTP id o193mr18731406wmd.102.1456225921874; Tue, 23 Feb 2016 03:12:01 -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 x186sm25634427wmg.19.2016.02.23.03.12.00 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Feb 2016 03:12:00 -0800 (PST) From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [PATCH RESEND] mac80211: parse VHT info in injected frames Date: Tue, 23 Feb 2016 12:11:58 +0100 Message-Id: <1456225918-21256-1-git-send-email-lorenzo.bianconi83@gmail.com> X-Mailer: git-send-email 2.5.0 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)