From nobody Sat Dec 31 02:33:06 2022 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 4NkR4f6jrmz2lB2v; Sat, 31 Dec 2022 02:33:06 +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 4NkR4f6CT9z4HV9; Sat, 31 Dec 2022 02:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453986; 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=7VmS/Nsplsh8dq1pGxjEPsx742ufXiiLir+C/hQ20iQ=; b=uz8+T1QLLX650F1cHTTHG3ZimymjI0SKHs4qTkc16qpKWAsZGyyjy+jldK78I+6Q3QgoWj KbcTZ39yHUqJT/nCdTmyn8Y4V5rkCpfnPhqLWZMtMvWE6RYGqLt67NjMtIj+T43yTV7aoA o/4/Jeuh061D80FCykSGy6voh2ywjSd6jy9I9fa62t8URQ+X6yyEN57qkqI+rMAjy5OfV0 B/8s0iFWSGgoqTuS1k7AhttDSy2IaqZ6FQUckzlJrJPRF+wm0BlbQ6zfdriGSWSE2on58O XeF1lOuef2vA3rWm300egu2XuxIouyETH9DTsXZlfLVuervdJDUZ81/BU4AveA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672453986; 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=7VmS/Nsplsh8dq1pGxjEPsx742ufXiiLir+C/hQ20iQ=; b=yJFJR3+reGpLWd1Lu3bhJexkojO7VjkFmtomB48yR5lnoB4SwEs1BADl0kSUbADzrXwe0F mQ3ZSq/I2pv03IMPGTmiipvXBHmnxA9soh40gpKZGgSUHo4K2Whxnk6I9lD2uY8p6UE4pe 1w5voOwcixqifceiOkw9lU/8TNWOYYgG5CM66Zt5jJ9z/yJDBbLe06k2TdkYDygAPPMu4v YF2Hkue8iBkF4NsMS+LfiJ1Il3esSUl9yuFx9BZjfs/BgezDAVnZNCVwvdpExbOlqWinmC 0cSrzyhza/U5qRMg70OqLMBiItC9EO/lnUzHLvVHVBhl1RdqrR1GxMZc9ORkbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672453986; a=rsa-sha256; cv=none; b=ycGrjbH7EPabr3jhXOyNBMKmTwutqsqWXnA0V/vuvnlRz5LxW8O5mZK9sUoQbenm+ek4nX nVhhI0QoM3VpdkxBhn0SjEnF2LYtPmOV6Nm/+i8CxTTNvdXXMGajwjRJr2UplFc/pzEFvA HkCtel7LB22qAGqKrY4GXuUTGzwyfeLiDYIsiAMHp8hR9H0jci9au/Fcf+e5R46JoVz9tL eaP8pKvnVoG9W21LJf45Lnpo7HYvWVo9t4wkKfUhSsB54tEvtxlX5GILuGIqB4Yp6Fc0UZ BcwDhsx6BD35GGFbv03E1mw9wwumLtfU10lJiS4I7/NkZz+R5o4lvZwis6I+dw== 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 4NkR4f54JSzXP6; Sat, 31 Dec 2022 02:33:06 +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 2BV2X6NE021220; Sat, 31 Dec 2022 02:33:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BV2X6Hd021218; Sat, 31 Dec 2022 02:33:06 GMT (envelope-from git) Date: Sat, 31 Dec 2022 02:33:06 GMT Message-Id: <202212310233.2BV2X6Hd021218@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 4b0af114370a - main - LinuxKPI: 802.11: move ieee80211_{unregister,restart}_hw out of header 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/main X-Git-Reftype: branch X-Git-Commit: 4b0af114370a5cb876012c381d3156c8fbdf7f40 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=4b0af114370a5cb876012c381d3156c8fbdf7f40 commit 4b0af114370a5cb876012c381d3156c8fbdf7f40 Author: Bjoern A. Zeeb AuthorDate: 2022-12-31 02:24:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-12-31 02:24:23 +0000 LinuxKPI: 802.11: move ieee80211_{unregister,restart}_hw out of header Migrate the two functions from the header into the implementation file in order to have access to more facilities and not to run into possible allocation/locking/... problems in the future. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/net/mac80211.h | 22 +++++++++++----------- sys/compat/linuxkpi/common/src/linux_80211.c | 17 +++++++++++++++++ 2 files changed, 28 insertions(+), 11 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 1a6c12a91356..d548b9bb956f 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -980,7 +980,9 @@ void linuxkpi_ieee80211_iffree(struct ieee80211_hw *); void linuxkpi_set_ieee80211_dev(struct ieee80211_hw *, char *); int linuxkpi_ieee80211_ifattach(struct ieee80211_hw *); void linuxkpi_ieee80211_ifdetach(struct ieee80211_hw *); +void linuxkpi_ieee80211_unregister_hw(struct ieee80211_hw *); struct ieee80211_hw * linuxkpi_wiphy_to_ieee80211_hw(struct wiphy *); +void linuxkpi_ieee80211_restart_hw(struct ieee80211_hw *); void linuxkpi_ieee80211_iterate_interfaces( struct ieee80211_hw *hw, enum ieee80211_iface_iter flags, void(*iterfunc)(void *, uint8_t *, struct ieee80211_vif *), @@ -1110,14 +1112,11 @@ ieee80211_register_hw(struct ieee80211_hw *hw) return (error); } -static __inline void +static inline void ieee80211_unregister_hw(struct ieee80211_hw *hw) { - wiphy_unregister(hw->wiphy); - linuxkpi_ieee80211_ifdetach(hw); - - IMPROVE(); + linuxkpi_ieee80211_unregister_hw(hw); } static __inline struct ieee80211_hw * @@ -1127,6 +1126,13 @@ wiphy_to_ieee80211_hw(struct wiphy *wiphy) return (linuxkpi_wiphy_to_ieee80211_hw(wiphy)); } +static inline void +ieee80211_restart_hw(struct ieee80211_hw *hw) +{ + linuxkpi_ieee80211_restart_hw(hw); +} + + /* -------------------------------------------------------------------------- */ static __inline bool @@ -1830,12 +1836,6 @@ ieee80211_free_txskb(struct ieee80211_hw *hw, struct sk_buff *skb) linuxkpi_ieee80211_free_txskb(hw, skb, 0x455458); } -static __inline void -ieee80211_restart_hw(struct ieee80211_hw *hw) -{ - TODO(); -} - static __inline void ieee80211_ready_on_channel(struct ieee80211_hw *hw) { diff --git a/sys/compat/linuxkpi/common/src/linux_80211.c b/sys/compat/linuxkpi/common/src/linux_80211.c index 3741996eff1c..d93eba6cece8 100644 --- a/sys/compat/linuxkpi/common/src/linux_80211.c +++ b/sys/compat/linuxkpi/common/src/linux_80211.c @@ -2345,6 +2345,23 @@ lkpi_ic_vap_create(struct ieee80211com *ic, const char name[IFNAMSIZ], return (vap); } +void +linuxkpi_ieee80211_unregister_hw(struct ieee80211_hw *hw) +{ + + wiphy_unregister(hw->wiphy); + linuxkpi_ieee80211_ifdetach(hw); + + IMPROVE(); +} + +void +linuxkpi_ieee80211_restart_hw(struct ieee80211_hw *hw) +{ + + TODO(); +} + static void lkpi_ic_vap_delete(struct ieee80211vap *vap) {