From nobody Fri Feb 17 23:44:53 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 4PJT1x2wjZz3rxgj; Fri, 17 Feb 2023 23:44:53 +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 4PJT1x2ML0z3H1s; Fri, 17 Feb 2023 23:44:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677493; 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=lzpzsjGFebMWZrndJdbW1D9/4X2s0aAU82HM0cVe70g=; b=Kq6AURRy3wfZyvViKsy1RS39mvtaGIBuZlTGr7pH7DkFcdNPjFTHANeGTlfgL8irGxSKLZ bH5WRE8+cWuYoqAC1e3sG+TWzLcXZwwDGjC8EffKZ+UFSwABGKUOSY9whEmav0b/Un+x+a 84Cao44tOzQDSMbDCj1uWBTWQJ/emNk1KMjdSVbhod9EP1lbtk5KObOR7c7n2crcGJYjFY k5/GVS6beQ+1ZDBCYDG3x+PBtddiUGsVrNUMSaFqUEDA+ZUODFiaQwwWSRYjwZFF3CXMO3 Snl5a5Cc0GmJ3P/92k8ZJUZATje6oLWD5M58te7XWRblP94cAn0AVuVj1+bodQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676677493; 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=lzpzsjGFebMWZrndJdbW1D9/4X2s0aAU82HM0cVe70g=; b=twzuwBLoIlR561mhfZ4plnQSiThaIxe3NgW7cnm9QXRIbT3YU/G7gpE1LE12UF4DVayUT7 saeAJQLWBIV05sIDutwB4/chtUJEItCUSh43WjxMVHuspM6VV4/STAJIrZwf8CRCugXaCi yulCu8qglGZqi12ysUkAy89IL4t74C2lsPJc8ZgQ9nTLk+7GTQxJ0CIaqs8iTVsxl/Film W+YYLk+mKIwjrz6rrsrp0YigpEgdbvr3XeBwRd5OigpzlcrnN0CTDes7EgTgIKHiSHYKrL /9vpRVc/GeZvOGccHRK8fde1lSmkj4EtMm3T3RBlx+Q3AxbuiZlXNxBPg9to6Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676677493; a=rsa-sha256; cv=none; b=Q2cwNEHIcvMUZos2stRJMroM56MoQdkRqYiXDpdj4vMuA1GzHtU8WAl0CR+G3kfkTv7mTd aJe992uGvXTOmhVN1Ae1SakxtbRvuXdSlw+q/xjJXD66YODpxGzkOPtrrwEu1veeMbwi7N IIbBf/qSK/zr3A58MLaqh6e+tpTFMWY/CE53fy9OM0ewE7MPXoHs7YeaWDKFiFAefywfHL ex2zNl/w+QP1umXGq2R9lL3heVjzk6iSWyXn/lQ8yoFg2qz34BoiqDz/D3jdOoFMts9gZu xrrOYAWoSXiS7a8N9SBUMBLKrqIH2YLMUIpHQT9KZHyuIEWgxV2DUqOxmjY8Hg== 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 4PJT1x1T2rz11fR; Fri, 17 Feb 2023 23:44:53 +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 31HNirHU025165; Fri, 17 Feb 2023 23:44:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31HNirpF025164; Fri, 17 Feb 2023 23:44:53 GMT (envelope-from git) Date: Fri, 17 Feb 2023 23:44:53 GMT Message-Id: <202302172344.31HNirpF025164@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: d282e777d7c9 - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: d282e777d7c9721614f110a1de66c7d88d0a6ea8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=d282e777d7c9721614f110a1de66c7d88d0a6ea8 commit d282e777d7c9721614f110a1de66c7d88d0a6ea8 Author: Bjoern A. Zeeb AuthorDate: 2023-01-31 13:39:04 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-02-17 23:42:15 +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 MFC after: 3 days (cherry picked from commit a3baca22d0b7789a040a60f389e3c132b6e1755b) --- 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