From patchwork Tue Feb 23 14:43:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 8393091 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 87EDA9F1D4 for ; Tue, 23 Feb 2016 14:43:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id A2BD3202AE for ; Tue, 23 Feb 2016 14:43:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A7F362027D for ; Tue, 23 Feb 2016 14:43:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753344AbcBWOni (ORCPT ); Tue, 23 Feb 2016 09:43:38 -0500 Received: from mail-wm0-f54.google.com ([74.125.82.54]:35979 "EHLO mail-wm0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752639AbcBWOni (ORCPT ); Tue, 23 Feb 2016 09:43:38 -0500 Received: by mail-wm0-f54.google.com with SMTP id g62so225694729wme.1 for ; Tue, 23 Feb 2016 06:43:37 -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=P7gAWVS07ZjJp84KbCUw9dkehM7K22wduFuBBiFIAR4=; b=OPVJ55Je5BTXET/ovGw7Z/v5k2kEI+iW8zvgWO/yefhNTI4MDKaWxxMPTnRza5k7mj x32oYpse0ZmZed1izOjcBonDl3/nJ9V5AwVXt6msodK2rpaOJKv/XnYahG2KQnOQeYBP 49/j1r9qzaB0t4Iu0Jw4OfIy11dCpExn3DwkPXd53Ghu64VNcNzGYMDLRONacQx097tL ivscgFSQvtvVZV3+dSdpVmULOT6Us59LaB4DloGZHTm1UYpSXW8xftUpa8sJaOBbmBGG ceueWwo26SvcdS9pcz5Y7hBzSqReVmsNST814cxhDKfSIn2toV7ooLcGtfNL6RAPCvYr 8ueg== 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=P7gAWVS07ZjJp84KbCUw9dkehM7K22wduFuBBiFIAR4=; b=nMJj4+K/XUFkal282m9Jt4Zm4J6bM5TueRVbrNph5eIZzIPuI89Vejl7tenit6HI3q tWrahyE6jkg9eKG7AkqW6nHDCqhZwPEw/Ef+3zOFyYqmbF3uhCfZ2Rwu5KRzCRrsDORb Um3ZEdspkpIDltKp/ZRepSuvoJIXhEHJqs9yBvpU9kVIQwf8AzxMk/8FdQoLBY7PBYZB XT4dbU3p4GeBKPXnthn0lpIGZEo6rjfIDtWsQfGE24DKxooy9YU3phMRQvTEpXVnWoQ+ dluPsGov8oy5RdjEShgNYta5WkrEhNrj+yqyzxpdzBfIu+x5fxJKUFSnl2bW69p5APkf pGmQ== X-Gm-Message-State: AG10YOTL02gwe6T7CAbTAhCMl+defsDobnbVvuTGQxVmt3Lz492OTUcCvrqq6HMwBAv6nw== X-Received: by 10.194.187.175 with SMTP id ft15mr34075280wjc.141.1456238617178; Tue, 23 Feb 2016 06:43:37 -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 lh1sm29944629wjb.20.2016.02.23.06.43.36 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Feb 2016 06:43:36 -0800 (PST) From: Lorenzo Bianconi To: linux-wireless@vger.kernel.org Cc: Johannes Berg Subject: [PATCHv2] mac80211: parse VHT info in injected frames Date: Tue, 23 Feb 2016 15:43:35 +0100 Message-Id: <1456238615-832-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 --- v2: - fix mac80211-injection documentation --- Documentation/networking/mac80211-injection.txt | 13 +++++++++++ net/mac80211/tx.c | 31 +++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/Documentation/networking/mac80211-injection.txt b/Documentation/networking/mac80211-injection.txt index ec8f934..e0efcaf 100644 --- a/Documentation/networking/mac80211-injection.txt +++ b/Documentation/networking/mac80211-injection.txt @@ -45,6 +45,19 @@ 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 mcs and number of streams used in the transmission (only for devices + without own rate control). Also other fields are parsed + + flags field + IEEE80211_RADIOTAP_VHT_FLAG_SGI: use short guard interval + + bandwidth field + 1: send using 40MHz channel width + 4: send using 80MHz channel width + 11: send using 160MHz channel width + 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)