From nobody Thu Apr 14 18:01:25 2022 X-Original-To: dev-commits-src-branches@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 AB3601B441EE; Thu, 14 Apr 2022 18:01:26 +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 4KfS2G3DmSz3wGT; Thu, 14 Apr 2022 18:01:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649959286; 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=52R5VyZgH52tGW0gCcH3ScmHq+T1YAbEc7m6ioy+Z/w=; b=pP0zkk4rjE51S3hdL+KgfqB+7GVuwosUcMdoyOUAW/G9ZY0D/1RukqOAxiJTEd6A5F7R+B u/8QiRwvW11mc0OvGerfhhme3VZjsbfmUqPufA3JK32/7BinhkBpjNxRw2rmn2T3STXKpm yyaQE4nEXUv9FRfwAIGx7tGg9K6wG2PNIrXEGpdh+GKOqZbZYhTAhY98JYa3LMbWl+/uLi FWQ6UZG72J2cZkri2m8jqJaYn3ww4W0f0U7QqH4+t8XQZn7FIeK19yLUngZcCBfPirunli VOyZWBBeiBUbnvfxGiy/oCo9Z6iV34DSfSZP1ciDevuijKFn9tNES3DycvOVdw== 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 EC15524F5F; Thu, 14 Apr 2022 18:01:25 +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 23EI1PWE015974; Thu, 14 Apr 2022 18:01:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23EI1PFs015973; Thu, 14 Apr 2022 18:01:25 GMT (envelope-from git) Date: Thu, 14 Apr 2022 18:01:25 GMT Message-Id: <202204141801.23EI1PFs015973@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: 797188ba9a16 - stable/13 - LinuxKPI: 802.11: add ieee80211_beacon_get_tim(), ieee80211_sn_sub() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 797188ba9a16a35d45a3c2f24c23164bd76341b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649959286; 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=52R5VyZgH52tGW0gCcH3ScmHq+T1YAbEc7m6ioy+Z/w=; b=pLnmPUaOTLCtRF1VKMfQxEA7O3jT3FW9MQhU74vi1qlXrcjuJV7OfwAD4YhB1ljJTncGeK vu2nE2S2km5kIjs/PhQwZ2a3hc1jR6EQNjTjKyzcZYXg07rXYRNVSeoN/fdZHAFQc+UqLQ 9Alh2aZXjROH/ElO67KVFVIDT870q8nmkw3di7d68DTB8uGfAuMPsWKXxYy39f1x20RPiR cGAh5GB9ndvVAmuTYiLnPgOo35OXhhKzjieoQ5PdRoJfS9ERRl9TiyMMvUSCOaUlP2lt9r TMmTb2p1ESBge4vg5s5BK6Mg2t9fN0nwPdOFxmHxMvi5yTJSLuvngDaq1o+Mcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649959286; a=rsa-sha256; cv=none; b=PDDApdAw/OFGWsVQhDAMKNfIwuVgM3KwYHtOiAN6gptb6YB4r/YLE4ENYegW2AKp2fZCFc 5J5NVpq8ofyuBciPlgBwDNzjKhypOtb6OBylRh1r2oj2fsDSAU0mj1prAirr2IxKOpKAWG P8FThcnFHbKpq7PSLerwVd/k4g2lNTsaQ8CEES2qjih99XnJbtcSwgm/5GSR2Lw9gpSv7h GYiZMNXcKZPck9S5oZdldBdbndObl0IK+imhlcR2BDH20RQCzGgclOsRVpOH1IGPlHU630 AVJgftJi0wB7uRuVGX0LXqnXT+ns5Zy7IoNITUapcA+KJahuG94yKcOezLxExg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=797188ba9a16a35d45a3c2f24c23164bd76341b1 commit 797188ba9a16a35d45a3c2f24c23164bd76341b1 Author: Bjoern A. Zeeb AuthorDate: 2022-04-08 18:33:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2022-04-14 16:38:11 +0000 LinuxKPI: 802.11: add ieee80211_beacon_get_tim(), ieee80211_sn_sub() Add a dummy implementation for ieee80211_beacon_get_tim(). Add the implementation for ieee80211_sn_sub(). Sponsored by: The FreeBSD Foundation (cherry picked from commit 978f25e840fe4975f243e6077a764842f0e9d3eb) --- sys/compat/linuxkpi/common/include/net/mac80211.h | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/net/mac80211.h b/sys/compat/linuxkpi/common/include/net/mac80211.h index 49088cdea0eb..a5195581f237 100644 --- a/sys/compat/linuxkpi/common/include/net/mac80211.h +++ b/sys/compat/linuxkpi/common/include/net/mac80211.h @@ -1315,6 +1315,19 @@ ieee80211_get_tid(struct ieee80211_hdr *hdr) return (linuxkpi_ieee80211_get_tid(hdr)); } +static __inline struct sk_buff * +ieee80211_beacon_get_tim(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + uint16_t *tim_offset, uint16_t *tim_len) +{ + + if (tim_offset != NULL) + *tim_offset = 0; + if (tim_len != NULL) + *tim_len = 0; + TODO(); + return (NULL); +} + static __inline void ieee80211_iterate_active_interfaces_atomic(struct ieee80211_hw *hw, enum ieee80211_iface_iter flags, @@ -1672,11 +1685,10 @@ ieee80211_send_eosp_nullfunc(struct ieee80211_sta *sta, uint8_t tid) } static __inline uint16_t -ieee80211_sn_sub(uint16_t sn, uint16_t n) +ieee80211_sn_sub(uint16_t sa, uint16_t sb) { - TODO(); - return (0); + return ((sa - sb) & IEEE80211_SEQ_SEQ_MASK); } static __inline void