Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1307199pxk; Mon, 31 Aug 2020 15:57:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzmC04MFWvYPk3UoLpMJaR966apEFtGMXEKCEd7Fw4TlDzfOM+i61Wah1mY6IZzUUvgAj9g X-Received: by 2002:aa7:db10:: with SMTP id t16mr3026508eds.196.1598914627503; Mon, 31 Aug 2020 15:57:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1598914627; cv=none; d=google.com; s=arc-20160816; b=M3ZA2ztDUCMCBt7YmkxuQ+9SYyip1zWfiBYyNG8vvlOt4koI2XLZynLoOfeWPxz8nH sz1s2xSxiRemB3yNrw+PPIrUyHOSGZ6xAYk6xb6Qj6bAnUG6rPFCsNbtiywtgEPZLhPq 9LzG9dqdVFGG/uLTfCN62qaglAmCQHqtVAVWUV72rbeTtsL668BDC+Kv9YwOosqtHozu OgudJ9a6VEA4V/9psejKRRaH2WcKGSrpxF+E4nNVfLNPttOTJs21kiottzk86cchzx8p 49WBqDpH1Rbbx9L+/jSUMB0OzM4+DtzmGcLytkMMy/xgAba76efYS2ZzsNf4OtD9UI7v dkRA== 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=ZVKq6wRmyhusTElhePOaBBM2qdRd8vON8FRi4OK8sy0=; b=luAWuNmsMBOyBIoW+6Nzm/YKTAs/OUDQz9Se82uwX0PeptnkA6FuTCpGTkKKAfMLOf QaCsHx4uAGsFgwEwh3fsqo2eIFq7BiIDHNMjNcUk+uOtOkwGyXS4GDo4/OgaftoXEuZR IGTB+yV/5VmJ+Fobpxo16Z1Yl+RSacTYUSZpFvmftqkzV5wmkWNZxbLASZIuRx1vDqmk y5F7xVHLDEaSWjtU0tU+Gsw4typy2b0A9ComaEqCGbB7tcA7kSDi/ek0LGAwD6rehczf JkrQjODLJvfM/mQRnADf0kJp4Pzvy/VT7DVH66k5+a8A40nJ2tzkJXnxGdsKR38LifnT BIqg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id oo24si6113799ejb.651.2020.08.31.15.56.43; Mon, 31 Aug 2020 15:57:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730177AbgHaU4x (ORCPT + 99 others); Mon, 31 Aug 2020 16:56:53 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:52444 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1729433AbgHaU4w (ORCPT ); Mon, 31 Aug 2020 16:56:52 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 4A4894F8D69; Mon, 31 Aug 2020 20:56:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at web.adapt-ip.com Received: from web.adapt-ip.com ([127.0.0.1]) by localhost (web.adapt-ip.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id aOxkkUWwJDvo; Mon, 31 Aug 2020 20:56:49 +0000 (UTC) Received: from atlas.campbell.adapt-ip.com (gateway.adapt-ip.com [173.164.178.20]) (Authenticated sender: thomas@adapt-ip.com) by web.adapt-ip.com (Postfix) with ESMTPSA id E8A3D4F8F84; Mon, 31 Aug 2020 20:56:13 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v2 20/22] nl80211: include frequency offset in survey info Date: Mon, 31 Aug 2020 13:55:58 -0700 Message-Id: <20200831205600.21058-21-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200831205600.21058-1-thomas@adapt-ip.com> References: <20200831205600.21058-1-thomas@adapt-ip.com> 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 Recently channels gained a potential frequency offset, so include this in the per-channel survey info. Signed-off-by: Thomas Pedersen --- include/uapi/linux/nl80211.h | 2 ++ net/wireless/nl80211.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/include/uapi/linux/nl80211.h b/include/uapi/linux/nl80211.h index 70076492ebc9..dd5591794e48 100644 --- a/include/uapi/linux/nl80211.h +++ b/include/uapi/linux/nl80211.h @@ -4085,6 +4085,7 @@ enum nl80211_user_reg_hint_type { * receiving frames destined to the local BSS * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number * currently defined + * @NL80211_SURVEY_INFO_FREQUENCY_OFFSET: center frequency offset in KHz * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use */ enum nl80211_survey_info { @@ -4100,6 +4101,7 @@ enum nl80211_survey_info { NL80211_SURVEY_INFO_TIME_SCAN, NL80211_SURVEY_INFO_PAD, NL80211_SURVEY_INFO_TIME_BSS_RX, + NL80211_SURVEY_INFO_FREQUENCY_OFFSET, /* keep last */ __NL80211_SURVEY_INFO_AFTER_LAST, diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index 578d99088719..5468c02d0927 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -9224,6 +9224,11 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 portid, u32 seq, survey->channel->center_freq)) goto nla_put_failure; + if (survey->channel && + nla_put_u32(msg, NL80211_SURVEY_INFO_FREQUENCY_OFFSET, + survey->channel->freq_offset)) + goto nla_put_failure; + if ((survey->filled & SURVEY_INFO_NOISE_DBM) && nla_put_u8(msg, NL80211_SURVEY_INFO_NOISE, survey->noise)) goto nla_put_failure; -- 2.20.1