From nobody Tue Mar 29 23:54:25 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 1D23A1A44F23; Tue, 29 Mar 2022 23:54: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 4KSmcy00Tgz4jTv; Tue, 29 Mar 2022 23:54:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648598066; 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=4p4EH6w1d4/FhNUqy/0fq02aj3LXVQKzvm61jQrXCzA=; b=rQBBedN5WHesCJ+8svxQ27qMObBkFP/N/tQqUIA3URIBJhgKTWVVOLYILC0WHXprAsoY1x wVkHoGmEsV4WhNJS1Ci2Ikps0QBxoyPItC1hDvRnydC3Gow4MmXMtAlGHLtlkgiwy/LCVd P2fswxtyf5waRZ6CVuzoaY+KQ4uH3Iw8VV32cWry+5XpvQMk6/bZKfziLPofSvKgrV+nwb iGbSaioHxwaUfH5THD6DW/NA2EaKbJL4hwXL2BtsLMVQNVLTDgGrTjpwBAaVI5ohJpGFV7 sq+Ev9JqWlfGE+G69zgbhHSCpU2sQ0IzWhQrDbFk2GWFFkzjXlagRbV9+nzWNQ== 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 C6671515; Tue, 29 Mar 2022 23:54: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 22TNsPue034432; Tue, 29 Mar 2022 23:54:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TNsPUP034431; Tue, 29 Mar 2022 23:54:25 GMT (envelope-from git) Date: Tue, 29 Mar 2022 23:54:25 GMT Message-Id: <202203292354.22TNsPUP034431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: a5ece99d2291 - releng/13.1 - devd: correct wifi regexp 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: a5ece99d2291267df00699e83a9e1304e11a4c34 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648598066; 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=4p4EH6w1d4/FhNUqy/0fq02aj3LXVQKzvm61jQrXCzA=; b=dkrHpHuDmjogg+C2RJdsSnskP/XyDaYwVv4PoYQ4EDC1CNNxZNqXZWsyJdabIkF51yRcc0 umnDMQmJtmBvkfNltO26KiQjRZIHyv/qoPNwxWYAh/msvw34zUp2NbbzflzMlTq2xJb0eX SAqf25Nxu3sABNhsMMXHVPQnAxdBJeNTmfiLgdzQINDGWZySS1KAk+J3KrYN1V/cQJiV0R 49B9ZwW7WVRenkS2fKi7ib5RSCeKlCBiUKHHYyUH1DTS7U7vBOPc1mQgbyHdsiOOpIPqBv x4sLXVWlqU+k9jWu1sxVbBWR/E9hx3V1CnsZfsfADP68UTjchQPsn0424iadHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648598066; a=rsa-sha256; cv=none; b=c2L7CV8RCawME4uuhQvmkl6f1B/9ugK0Xg4ulDYfcjXY4e5V31IAxcxUCZ6eb8ftymvKmi 8eijAXFwI76dwsbc/7dGiRWtdz5yQUH6qSD1RQwvuLSVs0AHxtarGAw8onE1OFZrn8L5aZ wDvPXWE0rUqyUpRUhLOTtcEJ/brZQQZ+EtNzAkBUk4fhOJsPek8DzoquE/Y9AMlDa+IvgZ cakV0IJjZ053r1tW5kOB+6v4icmMk29hyDM//ZhHs1x2netE/boNDdduixxHX4pvqnbKQr 1CotfKKrm8PoWxemjz5BcSHzkwsFl4qLj3Rmtd1UWzncWSk2KqqtrAe4adx8Uw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=a5ece99d2291267df00699e83a9e1304e11a4c34 commit a5ece99d2291267df00699e83a9e1304e11a4c34 Author: Warner Losh AuthorDate: 2022-01-09 17:16:31 +0000 Commit: Warner Losh CommitDate: 2022-03-29 23:54:16 +0000 devd: correct wifi regexp Correct the wifi regexp to include iwlwifi and remove wi driver that was has been retired. Approved by: re@ (gjb) Sponsored by: Netflix (cherry picked from commit e0ab0ff104cb0e817d47a1a2a235f915ec1a31f4) (cherry picked from commit eeec49e0b30a3faf2985e27f163a4c2f7b511e7c) --- sbin/devd/devd.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbin/devd/devd.conf b/sbin/devd/devd.conf index 1836afe589e4..c6608d14ce42 100644 --- a/sbin/devd/devd.conf +++ b/sbin/devd/devd.conf @@ -17,10 +17,10 @@ options { pid-file "/var/run/devd.pid"; # Setup some shorthand for regex that we use later in the file. - #XXX Yes, these are gross -- imp + #XXX Yes, this is gross -- imp set wifi-driver-regex - "(ath|bwi|bwn|ipw|iwi|iwm|iwn|malo|mwl|otus|ral|rsu|rtwn|rum|\ - run|uath|upgt|ural|urtw|wi|wpi|wtap|zyd)[0-9]+"; + "(ath|bwi|bwn|ipw|iwlwifi|iwi|iwm|iwn|malo|mwl|otus|ral|rsu|rtwn|rum|\ + run|uath|upgt|ural|urtw|wpi|wtap|zyd)[0-9]+"; }; # Note that the attach/detach with the highest value wins, so that one can