Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp4156904pxk; Tue, 8 Sep 2020 12:07:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKcwk9znDNbCJbge3z4WTUc1IrkMa3oXnZSeZFt8WlmTJtVzdMkB+6lkiABOCoZ3RqxxNS X-Received: by 2002:a17:906:4a8c:: with SMTP id x12mr28298250eju.271.1599592069214; Tue, 08 Sep 2020 12:07:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599592069; cv=none; d=google.com; s=arc-20160816; b=i+vcRElx+Xq4owhoswy1LYvRSVrAK6TiH7SV1+zHw1vbAQ55RgQn/tNq92MghLKT+J PvsS3MKZaNvakCL4Ue2bGnw0m7gML1SNWNfcpdc/E1FNtuu/I89HKIz1Yvs69m3G5V+B 5SzZln+1TTBz6/fcbmA8YHO4EqK0DXJww0wlI9e014lbd0lxcJI7nsGCP1AhtvcQN5TC OuWr7j1lGzIjGwdTlpFzwsX32pHlAz4IVzwj7udqKli0HyfT6F1uQFG0SM0WdnQgehSW lUDaCj4yCIexk8P6aZFjY3mfThfVzxIjc9egXMqttDvIxHdaYLLJZDlxhgSnxB4B6Z1Z engA== 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=NVm75dq2OHGpknsE0w+ytlgRALrdlKwWrMCgDWEkMr8=; b=pUacSq4mHu6+5Bu39N9kYkFIhgv67D8bGC8I5OXjnUjztpyZ/d/LGNrJa/sEq1aaET v5ynMeor9QL/hOt3bzaby3he4GbLvYDYGs3AVRHzFbZa5fhqUs7JIjSDlbRDUgYSP0lm YILHnC4WkRzl+v9ONR0mJ+stGkMEWo0eM6ej95++K/myWgRHD+qcGK6XTHu00fUjdedf MAC62XKnEWqKpF6rVHn/VupAbi1am+VTeLfHOaScOLmTVTcZsRjrKIWNovVRgcgjD3PV 60s9YW7BjawVkxDrTyd5+iIciIzkFugrtUMjl0BTEyx+Qy3HQ0XTQv2I6k/fdinj44Ic wRhw== 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 k16si6955810ejb.210.2020.09.08.12.07.25; Tue, 08 Sep 2020 12:07:49 -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 S1731489AbgIHTEQ (ORCPT + 99 others); Tue, 8 Sep 2020 15:04:16 -0400 Received: from mail.adapt-ip.com ([173.164.178.19]:52822 "EHLO web.adapt-ip.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731745AbgIHTD7 (ORCPT ); Tue, 8 Sep 2020 15:03:59 -0400 Received: from localhost (localhost [127.0.0.1]) by web.adapt-ip.com (Postfix) with ESMTP id 235194F9B1A; Tue, 8 Sep 2020 19:03:56 +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 663mRQjQERGC; Tue, 8 Sep 2020 19:03:53 +0000 (UTC) Received: from atlas.ibsgaard.io (c-73-223-60-234.hsd1.ca.comcast.net [73.223.60.234]) (Authenticated sender: thomas@adapt-ip.com) by web.adapt-ip.com (Postfix) with ESMTPSA id EE4B04F9B1B; Tue, 8 Sep 2020 19:03:25 +0000 (UTC) From: Thomas Pedersen To: Johannes Berg Cc: linux-wireless , Thomas Pedersen Subject: [PATCH v3 20/22] nl80211: include frequency offset in survey info Date: Tue, 8 Sep 2020 12:03:21 -0700 Message-Id: <20200908190323.15814-21-thomas@adapt-ip.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200908190323.15814-1-thomas@adapt-ip.com> References: <20200908190323.15814-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 493813177df2..daf403bfa168 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