The branch stable/13 has been updated by gbe: URL: https://cgit.FreeBSD.org/src/commit/?id=0a389bc09bdab3a8174876e971f88eefe3a693ab
commit 0a389bc09bdab3a8174876e971f88eefe3a693ab Author: Gordon Bergling <g...@freebsd.org> AuthorDate: 2024-09-20 18:00:04 +0000 Commit: Gordon Bergling <g...@freebsd.org> CommitDate: 2024-09-23 04:51:26 +0000 bluetooth(3): Fix two typos in source code comments - s/conficts/conflicts/ (cherry picked from commit 9046ecff409c45205aad34ef8d959d79dd20cf8f) --- 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 9814d9e0bceb..f5fd0605faee 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. */