From patchwork Wed Feb 10 16:31:17 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 8273261 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 E52F6BEEE5 for ; Wed, 10 Feb 2016 16:31:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0041E2037E for ; Wed, 10 Feb 2016 16:31:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A9E762039E for ; Wed, 10 Feb 2016 16:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643AbcBJQb0 (ORCPT ); Wed, 10 Feb 2016 11:31:26 -0500 Received: from mail-wm0-f53.google.com ([74.125.82.53]:32887 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751057AbcBJQbW (ORCPT ); Wed, 10 Feb 2016 11:31:22 -0500 Received: by mail-wm0-f53.google.com with SMTP id g62so34403854wme.0 for ; Wed, 10 Feb 2016 08:31:22 -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=axn2ZW+yJGgcz4GiHu4GU7YFI9yPjomlz2PjR6RmZQ0=; b=sXqsXN/RO4TOXuNJ/gLNavkM9o1IbL2nyK5I8zeiGRKkMnL35XtzmxHToi+tYd3hgN ey3PAf0YjQAJ1SAv+iDILcbUvaOb7EeoHSzZbjXQ1xGaQg25qrHoIMSr9+r+U87z5Bob OfdQUp6Yp1vFPirUgShQw3KKXByVBY0+GQ3GXYrd9YYyXVTCftSvXYsKwxER+Dfdql3r eSDgu2u0PDgJL4r5hwWOM+iphqm7AkF9wsUjVemMbK9lrtPk2Ih9bK6eqJwE0XYkhB8J OxGVCBCcsmfBkykNoXj2e+4brfMGol6tfx+TVFAQKBmOPb5Q9i1RDsLieyPvvWv4iAPD 9xWA== 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=axn2ZW+yJGgcz4GiHu4GU7YFI9yPjomlz2PjR6RmZQ0=; b=aNuG76ng9bn3Ulkqd/BZCNbq4aACXXkWO7NbmomAz2sD9s4sV+mlS1ACeNq/RZXT+6 ei1LKqV6gbHTWlt/E8WKsLdVRxI+KXq34uOEJww8mQO5ueay0Uh1sYZA0tybMo5YYOJ4 7XglbT+1c6Qu5SLgMCtWT3RkzKY4OVjjyARvheBpW2DruDqp2OwvMdSwyx0llGnBMuyl 7dH6Opm4Iqi+68Maf/jADvJaPcMqgrF4jT65KUhjHPEbTqFwdTgpBRQeF8WZiGE34MiP JfIoGpEOM8R7wVrVxlZuMop9sde8GgP+c0P3+OmcOTw07/4J6i1dYgGemyuPMypVXQru rxeQ== X-Gm-Message-State: AG10YORW5BVInFm7aye4MgXZUl7MtQNjo1QDliHPgPAUWolOMV7m3dlPEqWI4tV7n3W/bA== X-Received: by 10.28.111.91 with SMTP id k88mr11529864wmc.86.1455121881722; Wed, 10 Feb 2016 08:31:21 -0800 (PST) Received: from localhost.localdomain (net-188-152-170-117.cust.vodafonedsl.it. [188.152.170.117]) by smtp.gmail.com with ESMTPSA id h132sm4107078wmf.9.2016.02.10.08.31.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Feb 2016 08:31:20 -0800 (PST) From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [RFC 2/2] mac80211: parse VHT info in injected frames Date: Wed, 10 Feb 2016 17:31:17 +0100 Message-Id: <1455121877-7238-3-git-send-email-lorenzo.bianconi83@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1455121877-7238-1-git-send-email-lorenzo.bianconi83@gmail.com> References: <1455121877-7238-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=-7.0 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 on 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)