From nobody Sat Feb 04 16:20:36 2023 X-Original-To: dev-commits-src-main@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 4P8HnJ3q2Gz3nZLx; Sat, 4 Feb 2023 16:20:36 +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 4P8HnJ1k4nz44XL; Sat, 4 Feb 2023 16:20:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527636; 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=fTUdv1p9OXt72dD+kyMLF0o9VjP37wy8xGGMrMk+ADs=; b=anxxwdLB+qdu6+URap1im/fqU3BJrUS6MpLib+3cIBtKAKHWfD9vGjNxLFCagC/I7uf+a6 DVEKXaE9twOq+0lA5kog8gHPXljMPLfC6Mh06jqE4cDw+DJfUDJqxdu+vDO4J8Vfy2/zfJ FpXwbiN/Vvd6zldIZE6oatCtvQn4c4eL05inB47c+/1DcS4Wn/NTdroWyn/rH6uJ942oqc SY8ix23eUqwqJO3JYSVAIGrfARCvhqfjc+2MkPV7KRniCrR7XYlvtVrXo2twsaEIn3WYtv M+UVhWpSSJeNBKqwZ8hqWgL9agCKJF8Of481s3Td/StOOluWkGIaLK5/8+qh3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527636; 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=fTUdv1p9OXt72dD+kyMLF0o9VjP37wy8xGGMrMk+ADs=; b=TVIQzTWiGe4Hol9mEtQMbfdpaBRIGnDqBO2yxC3DQxCjdjPj41bEM6pkuwbfr8qmhJsXAe JdSR5R+AZ04MSBugA6nOJ+XJLjfkR9VlLX2lFQcQjuso/WwQUQEBMdHiyC5YcVts58mQbV Qg4aHLgjLZxutGGOYCaC3lcHStIJvcjzvLnGg13uXWyahj/vQ107HzuHcz6qLblBxuLIjm QY1/K6S4keFV+A92hhYUy07ohg0jdNUt9nJsqLyu4cNF4MSYxVyTWXWlP6Sv0c72e0cHE4 s5VAfW/gPLjDMGb4u71coNOfaD4aUhxTMKu/+THTxESUvhXhS3krOr4uP771OQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527636; a=rsa-sha256; cv=none; b=GJeED1NJYWtQoWRc2CzjxVeU2Zs7otaXguaCdYYCqh3wknYcZ7FQgYKsx4g643SDlrpL1w 4g7rv1ibG9Aw/liVfenDI6fkhId8YQ2HPRFoX64xl4dDhejvcXwDBDkfE+S9OI61Zd3Q9b gwZxc5mpOvjGnuMKKyjStyf460K5ptNAlMT6QN+MEYFAUve6FpM6C2WX0KeSrT2VGPmH6s VnQbakqzC7Aqnzl9Rb7tGToLgt5FU5DIgGWUkICnWislRBM2qTjABII33EkYWUDJ5eBDGd mb9Sg+v029nBLbz4SPqcOAyeK0R8y2vKifSNeeZK2T+5d/umnI9YXn9euY9iXA== 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 4P8HnJ0r2VzLfX; Sat, 4 Feb 2023 16:20:36 +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 314GKaPA013831; Sat, 4 Feb 2023 16:20:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKajC013830; Sat, 4 Feb 2023 16:20:36 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:36 GMT Message-Id: <202302041620.314GKajC013830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: da6ae2cf1750 - main - rtwm: purge EOL release compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da6ae2cf17501da968976b095d2a744045ccb870 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=da6ae2cf17501da968976b095d2a744045ccb870 commit da6ae2cf17501da968976b095d2a744045ccb870 Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh CommitDate: 2023-02-04 16:13:10 +0000 rtwm: purge EOL release compatibility Remove FreeBSD 11 support Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/603 Differential Revision: https://reviews.freebsd.org/D35560 --- sys/dev/rtwn/if_rtwn_cam.c | 19 ------------------- sys/dev/rtwn/rtl8188e/r88e_rx.c | 13 ------------- sys/dev/rtwn/rtl8192c/r92c_fw.c | 13 ------------- sys/dev/rtwn/rtl8812a/r12a_rx.c | 13 ------------- 4 files changed, 58 deletions(-) diff --git a/sys/dev/rtwn/if_rtwn_cam.c b/sys/dev/rtwn/if_rtwn_cam.c index 6ee630533675..febb93fa97fd 100644 --- a/sys/dev/rtwn/if_rtwn_cam.c +++ b/sys/dev/rtwn/if_rtwn_cam.c @@ -117,11 +117,7 @@ rtwn_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, if (&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) { -#if __FreeBSD_version > 1200018 *keyix = ieee80211_crypto_get_key_wepidx(vap, k); -#else - *keyix = k - vap->iv_nw_keys; -#endif if (sc->sc_hwcrypto != RTWN_CRYPTO_FULL) k->wk_flags |= IEEE80211_KEY_SWCRYPT; else { @@ -176,15 +172,9 @@ rtwn_key_alloc(struct ieee80211vap *vap, struct ieee80211_key *k, } RTWN_UNLOCK(sc); if (i == sc->cam_entry_limit) { -#if __FreeBSD_version > 1200008 /* XXX check and remove keys with the same MAC address */ k->wk_flags |= IEEE80211_KEY_SWCRYPT; *keyix = 0; -#else - device_printf(sc->sc_dev, - "%s: no free space in the key table\n", __func__); - return (0); -#endif } end: @@ -322,16 +312,7 @@ rtwn_process_key(struct ieee80211vap *vap, const struct ieee80211_key *k, if (&vap->iv_nw_keys[0] <= k && k < &vap->iv_nw_keys[IEEE80211_WEP_NKID]) { -#if __FreeBSD_version <= 1200008 - struct ieee80211_key *k1 = &vap->iv_nw_keys[k->wk_keyix]; - - if (sc->sc_hwcrypto != RTWN_CRYPTO_FULL) { - k1->wk_flags |= IEEE80211_KEY_SWCRYPT; - return (k->wk_cipher->ic_setkey(k1)); - } else { -#else if (sc->sc_hwcrypto == RTWN_CRYPTO_FULL) { -#endif struct rtwn_vap *rvp = RTWN_VAP(vap); RTWN_LOCK(sc); diff --git a/sys/dev/rtwn/rtl8188e/r88e_rx.c b/sys/dev/rtwn/rtl8188e/r88e_rx.c index 16510839bd44..ec6174e3df00 100644 --- a/sys/dev/rtwn/rtl8188e/r88e_rx.c +++ b/sys/dev/rtwn/rtl8188e/r88e_rx.c @@ -77,9 +77,7 @@ r88e_classify_intr(struct rtwn_softc *sc, void *buf, int len) void r88e_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) { -#if __FreeBSD_version >= 1200012 struct ieee80211_ratectl_tx_status txs; -#endif struct r88e_tx_rpt_ccx *rpt; struct ieee80211_node *ni; uint8_t macid; @@ -120,7 +118,6 @@ r88e_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) (rpt->rptb1 & R88E_RPTB1_PKT_OK) ? "" : " not", ntries); -#if __FreeBSD_version >= 1200012 txs.flags = IEEE80211_RATECTL_STATUS_LONG_RETRY | IEEE80211_RATECTL_STATUS_FINAL_RATE; txs.long_retries = ntries; @@ -139,16 +136,6 @@ r88e_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) else txs.status = IEEE80211_RATECTL_TX_FAIL_UNSPECIFIED; ieee80211_ratectl_tx_complete(ni, &txs); -#else - struct ieee80211vap *vap = ni->ni_vap; - if (rpt->rptb1 & R88E_RPTB1_PKT_OK) { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_SUCCESS, &ntries, NULL); - } else { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_FAILURE, &ntries, NULL); - } -#endif } else { RTWN_DPRINTF(sc, RTWN_DEBUG_INTR, "%s: macid %u, ni is NULL\n", __func__, macid); diff --git a/sys/dev/rtwn/rtl8192c/r92c_fw.c b/sys/dev/rtwn/rtl8192c/r92c_fw.c index 7ad6d7d2dfe6..be284ff91c61 100644 --- a/sys/dev/rtwn/rtl8192c/r92c_fw.c +++ b/sys/dev/rtwn/rtl8192c/r92c_fw.c @@ -364,9 +364,7 @@ r92c_set_rssi(struct rtwn_softc *sc) static void r92c_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) { -#if __FreeBSD_version >= 1200012 struct ieee80211_ratectl_tx_status txs; -#endif struct r92c_c2h_tx_rpt *rpt; struct ieee80211_node *ni; uint8_t macid; @@ -412,7 +410,6 @@ r92c_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) (rpt->rptb7 & R92C_RPTB7_PKT_OK) ? "" : " not", ntries); -#if __FreeBSD_version >= 1200012 txs.flags = IEEE80211_RATECTL_STATUS_LONG_RETRY; txs.long_retries = ntries; if (rpt->rptb7 & R92C_RPTB7_PKT_OK) @@ -424,16 +421,6 @@ r92c_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) else txs.status = IEEE80211_RATECTL_TX_FAIL_UNSPECIFIED; ieee80211_ratectl_tx_complete(ni, &txs); -#else - struct ieee80211vap *vap = ni->ni_vap; - if (rpt->rptb7 & R92C_RPTB7_PKT_OK) { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_SUCCESS, &ntries, NULL); - } else { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_FAILURE, &ntries, NULL); - } -#endif } else { RTWN_DPRINTF(sc, RTWN_DEBUG_INTR, "%s: macid %u, ni is NULL\n", __func__, macid); diff --git a/sys/dev/rtwn/rtl8812a/r12a_rx.c b/sys/dev/rtwn/rtl8812a/r12a_rx.c index 98e0cabdff7c..ebe299214e98 100644 --- a/sys/dev/rtwn/rtl8812a/r12a_rx.c +++ b/sys/dev/rtwn/rtl8812a/r12a_rx.c @@ -66,9 +66,7 @@ __FBSDID("$FreeBSD$"); void r12a_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) { -#if __FreeBSD_version >= 1200012 struct ieee80211_ratectl_tx_status txs; -#endif struct r12a_c2h_tx_rpt *rpt; struct ieee80211_node *ni; int ntries; @@ -108,7 +106,6 @@ r12a_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) (rpt->txrptb0 & (R12A_TXRPTB0_RETRY_OVER | R12A_TXRPTB0_LIFE_EXPIRE)) ? " not" : "", ntries); -#if __FreeBSD_version >= 1200012 txs.flags = IEEE80211_RATECTL_STATUS_LONG_RETRY | IEEE80211_RATECTL_STATUS_FINAL_RATE; txs.long_retries = ntries; @@ -125,16 +122,6 @@ r12a_ratectl_tx_complete(struct rtwn_softc *sc, uint8_t *buf, int len) else txs.status = IEEE80211_RATECTL_TX_SUCCESS; ieee80211_ratectl_tx_complete(ni, &txs); -#else - struct ieee80211vap *vap = ni->ni_vap; - if (rpt->txrptb0 & R12A_TXRPTB0_RETRY_OVER) { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_FAILURE, &ntries, NULL); - } else { - ieee80211_ratectl_tx_complete(vap, ni, - IEEE80211_RATECTL_TX_SUCCESS, &ntries, NULL); - } -#endif } else { RTWN_DPRINTF(sc, RTWN_DEBUG_INTR, "%s: macid %u, ni is NULL\n", __func__, rpt->macid);