From nobody Thu Feb 23 19:34:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PN3BH2Hlvz3sfKV; Thu, 23 Feb 2023 19:34:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PN3BG6swtz459f; Thu, 23 Feb 2023 19:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7zVS4hHCaDBn+QLhmNOIrlGn14goDR9V3sRmISIGiE=; b=LtFr/g9PZ6g4vCt58qzrg+ZHjmkrVUemeNO9xqR8BgfMXIoaXCri3C+vbY8im/btQJnXVN X9uJj7yzG0xxacu30FdX5JIEmFYyHX2wwVa+GWn78MEl2ZzE3cEyNY9Rqi/0uooBw5d5AO B1a0HsrRzUEcrPlBqsX+0Lz93qG6iSreJ8S7E5lPb+M7uQdMHNHlFTWxtddSsNcn30WJvZ Ljdz24MCmgWByQIC/hbrBUmEwY1jSsZmiyuxmTbvtoE5heozhNAFgULdZBM+WlMLKKSefU JJlGfkfLsxh6bBQzVbjV9mee4S8QqjDKAFUBJJqLEKmQsDn3oyDWCu2q3qjS3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677180871; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=q7zVS4hHCaDBn+QLhmNOIrlGn14goDR9V3sRmISIGiE=; b=MHn4dYuYJ0J/fhZ3g7rhCvJzkt/ihnaZ8jP6r2SWmcuahJp4WAlfbBD/mzp0C28uaR8Qc9 LTILJoxIuLUVagebUnI4CnLBZuwBBqwWCbKAv0zBlOP/upg1kMzlt66t0rh/B1kKtYvpFu 10fWlslhqx1WxWU+cdVTZNlQ2EcueJYC6Z96YPJ9DT5UEoQjnwL9+tmoVIw0vzZEhK0y3/ pRlHyRZ5QbG4ZyL9H/f6LtI90FNuGd81ElRUfq5S9It9g2dmyfaR8WfkUoa2pFrttUUc+P VweT5otmI9JFmGy0OoKftuUCvQmYCeOeFuyRwlM2KXAdyvF0BKHp+9JqaVyJfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677180871; a=rsa-sha256; cv=none; b=aByx8E5L0H/1/LehGhHg2YdtJB4PFtJgb2EqNaJzqJlsQYWhr2WEhkrOxA/3hVicpWGf5s IX0Kkwm8R04wThv6uCpfkuFmmAs4PCKnmTKA+eSh0d8bzhgw9gFZZokILAvISBAtk3NP2L HKHhyLbC9x4kstHvwxyc+r4b9ocpEgwadGsHmtdQg38rmIREIr/nYBPoQqZYot5107V6ks I3GqTupNurr7zDpOykoQtYSLZF2rIU4zZTlie39TaJdLvZ60o+IoG/zDhDBBHUB7vmJYSn UBIB3nrAUKzQDodVYN37FOPXzQb1UJPGs+X+B2Bhivcj/oMrhgsuRpVefmV49w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PN3BG5zdhzvNG; Thu, 23 Feb 2023 19:34:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 31NJYU4U020273; Thu, 23 Feb 2023 19:34:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31NJYUtf020272; Thu, 23 Feb 2023 19:34:30 GMT (envelope-from git) Date: Thu, 23 Feb 2023 19:34:30 GMT Message-Id: <202302231934.31NJYUtf020272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 3473f9920c89 - releng/13.2 - LinuxKPI: 802.11: fix types and whitespace List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.2 X-Git-Reftype: branch X-Git-Commit: 3473f9920c8988cf24490b34c5c4d8448cef7df4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.2 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=3473f9920c8988cf24490b34c5c4d8448cef7df4 commit 3473f9920c8988cf24490b34c5c4d8448cef7df4 Author: Bjoern A. Zeeb AuthorDate: 2023-01-31 13:39:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-23 19:32:21 +0000 LinuxKPI: 802.11: fix types and whitespace Correct struct member types, fix whitespace, and remove superfluous return statements in void functions. No functional changes. Sponsored by: The FreeBSD Foundation Approved by: re (cperciva) (cherry picked from commit a3baca22d0b7789a040a60f389e3c132b6e1755b) (cherry picked from commit d282e777d7c9721614f110a1de66c7d88d0a6ea8) --- sys/compat/linuxkpi/common/include/net/cfg80211.h | 11 ++++++----- sys/compat/linuxkpi/common/include/net/mac80211.h | 6 ------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/cfg80211.h b/sys/compat/linuxkpi/common/include/net/cfg80211.h index 55a74227a338..8b73dc1abe3f 100644 --- a/sys/compat/linuxkpi/common/include/net/cfg80211.h +++ b/sys/compat/linuxkpi/common/include/net/cfg80211.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2020-2021 The FreeBSD Foundation + * Copyright (c) 2020-2023 The FreeBSD Foundation * Copyright (c) 2021-2022 Bjoern A. Zeeb * * This software was developed by Björn Zeeb under sponsorship from @@ -265,9 +265,8 @@ struct cfg80211_roam_info { }; struct cfg80211_bss_ies { - /* XXX TODO, type is best guess. Fix if more info. */ uint8_t *data; - int len; + size_t len; }; struct cfg80211_bss { @@ -937,6 +936,7 @@ struct iface_combination_params { struct regulatory_request { /* XXX TODO */ uint8_t alpha2[2]; + enum environment_cap country_ie_env; int initiator, dfs_region; int user_reg_hint_type; }; @@ -1029,8 +1029,9 @@ struct wiphy { uint32_t rts_threshold; uint32_t frag_threshold; struct tid_config_support tid_config_support; + uint8_t available_antennas_rx; + uint8_t available_antennas_tx; - int available_antennas_rx, available_antennas_tx; int features, hw_version; int interface_modes, max_match_sets, max_remain_on_channel_duration, max_scan_ssids, max_sched_scan_ie_len, max_sched_scan_plan_interval, max_sched_scan_plan_iterations, max_sched_scan_plans, max_sched_scan_reqs, max_sched_scan_ssids; int num_iftype_ext_capab; @@ -1200,7 +1201,7 @@ cfg80211_get_bss(struct wiphy *wiphy, struct linuxkpi_ieee80211_channel *chan, { return (linuxkpi_cfg80211_get_bss(wiphy, chan, bssid, ssid, ssid_len, - bss_type, privacy)); + bss_type, privacy)); } static inline void diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index d548b9bb956f..caf9be89281e 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -2394,7 +2394,6 @@ static __inline void ieee80211_resume_disconnect(struct ieee80211_vif *vif) { TODO(); - return; } static __inline int @@ -2410,7 +2409,6 @@ ieee80211_get_tkip_p1k_iv(struct ieee80211_key_conf *key, uint32_t iv32, uint16_t *p1k) { TODO(); - return; } static __inline struct ieee80211_key_conf * @@ -2426,14 +2424,12 @@ ieee80211_gtk_rekey_notify(struct ieee80211_vif *vif, const uint8_t *bssid, const uint8_t *replay_ctr, gfp_t gfp) { TODO(); - return; } static __inline void ieee80211_remove_key(struct ieee80211_key_conf *key) { TODO(); - return; } static __inline void @@ -2441,7 +2437,6 @@ ieee80211_set_key_rx_seq(struct ieee80211_key_conf *key, int tid, struct ieee80211_key_seq *seq) { TODO(); - return; } static __inline void @@ -2449,7 +2444,6 @@ ieee80211_report_wowlan_wakeup(struct ieee80211_vif *vif, struct cfg80211_wowlan_wakeup *wakeup, gfp_t gfp) { TODO(); - return; } static __inline void