From nobody Fri Sep 20 18:00:37 2024 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 4X9KtZ0kjsz5WSGX; Fri, 20 Sep 2024 18:00:38 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X9KtY65DXz44ns; Fri, 20 Sep 2024 18:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726855237; 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=dFHgNepelLpHl+OXNjHTtbyIwFtiA2W06EKIquT4oKQ=; b=ZMVBus9g12o0MtwG7OVrKUZD48VlbvWzvNSpUhC+bCdLgC/rWAdOhlIvAAxpbk2z/pCVV4 UodmXSDdZ2kyCugd59ovw+ORcBw9Xbxsmler8D1X+N0VWhZEc9Gh1Xh6q+ZEPY7bmCAGb0 7jVA3mcW5tM5R+Vo8M7BICD7yZ1FzB6RFjrZDVnRw0VdVDdtDuHteDEuSSdFiRJBBnHMiQ u406yimQi6g/SjI3QUiDsN1B67Dl4EImdRkYgtMEDFUSE4ZcW8kCazd8w+BdamNuiBU/gd hQrTDrHg90yxPlrh0ro8xStx14z5cNOQ5a3HZALgsOtWvY3Fm2eEAz6fe53AOQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726855237; a=rsa-sha256; cv=none; b=RERnR+UM0v9Fu0oOux3sKgrr+uKZOTPsaQldZVcS/MH+HaLNld24WpP8h9882STCWwbrVw /7SVk3xW+hgQo4raxRgkzNf4dKfKwmKbZ7b9wOhBP39vxyVmMChDlLltCN1edTzEb8RuRu wqWT5s2MwjC6fjHwT1hHI4nv6YfopKsDIHEG04vkQH94DcaXnGQD2PIAt3maBXbqKaTEBb VBUzDGzdFjxy1VBYEB57nJNtq424E35HcNSp/EzYVdSVYlv8ss6vf9ZQAMBUgt+4d7muJI iBXvoHwgnlXJmvbAob57rdw/ohR+E5l9aVOXDm4YTY4UmCzE7NkbHoEOjxS1Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726855237; 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=dFHgNepelLpHl+OXNjHTtbyIwFtiA2W06EKIquT4oKQ=; b=asTjAKCI3W5bB7ss7EnLDnT6CVqZrkHEKgENoTDChKy//f6IPgzFKjALUeRwZ/cMyCRMGh L816vcuir9u6uYI03m9I833QNQLP4wthuvmbe0d/XN0SZUBnqrUDgEZcnASiT9adUlnZMh 06/QH+fRrZF2ocVrAcGu6VhKAQ7/4Q11OT3x5v7PKti6W2/iOl15/4D1k7kXvrN/UMpLkU g73Yw7Y5rqV99fcUn6Os9aMa9YocuM8tEuSCZoI3b9kA5H51KyQHtS81hDj99n9/aKDyau p/F6syUsKLssjNbyJDJFlClvYK5DF+Qb9zgV7Qtt/5zKvECQtTGfDBzO2j+jyA== 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 4X9KtY5hfFz10NH; Fri, 20 Sep 2024 18:00:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48KI0bKH065350; Fri, 20 Sep 2024 18:00:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48KI0bsw065347; Fri, 20 Sep 2024 18:00:37 GMT (envelope-from git) Date: Fri, 20 Sep 2024 18:00:37 GMT Message-Id: <202409201800.48KI0bsw065347@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gordon Bergling Subject: git: 9046ecff409c - main - bluetooth(3): Fix two typos in source code comments 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gbe X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9046ecff409c45205aad34ef8d959d79dd20cf8f Auto-Submitted: auto-generated The branch main has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=9046ecff409c45205aad34ef8d959d79dd20cf8f commit 9046ecff409c45205aad34ef8d959d79dd20cf8f Author: Gordon Bergling AuthorDate: 2024-09-20 18:00:04 +0000 Commit: Gordon Bergling CommitDate: 2024-09-20 18:00:04 +0000 bluetooth(3): Fix two typos in source code comments - s/conficts/conflicts/ MFC after: 3 days --- sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c index ae5405529667..9fc26f53e9c6 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c @@ -789,7 +789,7 @@ ng_btsocket_l2cap_process_l2ca_cfg_req_rsp(struct ng_mesg *msg, if (op->result == NG_L2CAP_SUCCESS) { /* * XXX FIXME Actually set flush and link timeout. - * Set QoS here if required. Resolve conficts (flush_timo). + * Set QoS here if required. Resolve conflicts (flush_timo). * Save incoming MTU (peer's outgoing MTU) and outgoing flow * spec. */ @@ -991,7 +991,7 @@ ng_btsocket_l2cap_process_l2ca_cfg_ind(struct ng_mesg *msg, /* * XXX FIXME Actually set flush and link timeout. Set QoS here if - * required. Resolve conficts (flush_timo). Note outgoing MTU (peer's + * required. Resolve conflicts (flush_timo). Note outgoing MTU (peer's * incoming MTU) and incoming flow spec. */