Module Name: src
Committed By: maxv
Date: Sat Feb 29 11:40:06 UTC 2020
Modified Files:
src/sys/netbt: l2cap_signal.c rfcomm_session.c
Log Message:
pass the address of the field, instead of relying on it being the first
field of the structure/union, no functional change, discussed with plunky@
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/netbt/l2cap_signal.c
cvs rdiff -u -r1.26 -r1.27 src/sys/netbt/rfcomm_session.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netbt/l2cap_signal.c
diff -u src/sys/netbt/l2cap_signal.c:1.19 src/sys/netbt/l2cap_signal.c:1.20
--- src/sys/netbt/l2cap_signal.c:1.19 Tue Aug 21 14:59:13 2018
+++ src/sys/netbt/l2cap_signal.c Sat Feb 29 11:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: l2cap_signal.c,v 1.19 2018/08/21 14:59:13 plunky Exp $ */
+/* $NetBSD: l2cap_signal.c,v 1.20 2020/02/29 11:40:06 maxv Exp $ */
/*-
* Copyright (c) 2005 Iain Hibbert.
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: l2cap_signal.c,v 1.19 2018/08/21 14:59:13 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: l2cap_signal.c,v 1.20 2020/02/29 11:40:06 maxv Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -488,7 +488,7 @@ l2cap_recv_config_req(struct mbuf *m, st
if (opt.length != L2CAP_OPT_MTU_SIZE)
goto reject;
- m_copydata(m, 0, L2CAP_OPT_MTU_SIZE, &val);
+ m_copydata(m, 0, L2CAP_OPT_MTU_SIZE, &val.mtu);
val.mtu = le16toh(val.mtu);
/*
@@ -539,7 +539,7 @@ l2cap_recv_config_req(struct mbuf *m, st
* config request is merely advising us of their
* outgoing traffic flow, so be nice.
*/
- m_copydata(m, 0, L2CAP_OPT_QOS_SIZE, &val);
+ m_copydata(m, 0, L2CAP_OPT_QOS_SIZE, &val.qos);
switch (val.qos.service_type) {
case L2CAP_QOS_NO_TRAFFIC:
/*
@@ -729,7 +729,7 @@ l2cap_recv_config_rsp(struct mbuf *m, st
if (opt.length != L2CAP_OPT_MTU_SIZE)
goto discon;
- m_copydata(m, 0, L2CAP_OPT_MTU_SIZE, &val);
+ m_copydata(m, 0, L2CAP_OPT_MTU_SIZE, &val.mtu);
chan->lc_imtu = le16toh(val.mtu);
if (chan->lc_imtu < L2CAP_MTU_MINIMUM)
chan->lc_imtu = L2CAP_MTU_DEFAULT;
@@ -759,7 +759,7 @@ l2cap_recv_config_rsp(struct mbuf *m, st
* We don't support anything, but copy in the
* parameters if no action is good enough.
*/
- m_copydata(m, 0, L2CAP_OPT_QOS_SIZE, &val);
+ m_copydata(m, 0, L2CAP_OPT_QOS_SIZE, &val.qos);
switch (val.qos.service_type) {
case L2CAP_QOS_NO_TRAFFIC:
case L2CAP_QOS_BEST_EFFORT:
Index: src/sys/netbt/rfcomm_session.c
diff -u src/sys/netbt/rfcomm_session.c:1.26 src/sys/netbt/rfcomm_session.c:1.27
--- src/sys/netbt/rfcomm_session.c:1.26 Sun Feb 23 20:16:10 2020
+++ src/sys/netbt/rfcomm_session.c Sat Feb 29 11:40:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: rfcomm_session.c,v 1.26 2020/02/23 20:16:10 plunky Exp $ */
+/* $NetBSD: rfcomm_session.c,v 1.27 2020/02/29 11:40:06 maxv Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rfcomm_session.c,v 1.26 2020/02/23 20:16:10 plunky Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rfcomm_session.c,v 1.27 2020/02/29 11:40:06 maxv Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -1237,7 +1237,7 @@ rfcomm_session_recv_mcc_rpn(struct rfcom
rpn.param_mask = le16toh(rpn.param_mask);
} else if (m->m_pkthdr.len == 1) {
/* current settings request */
- m_copydata(m, 0, 1, &rpn);
+ m_copydata(m, 0, 1, &rpn.dlci);
rpn.param_mask = RFCOMM_RPN_PM_ALL;
} else {
DPRINTF("Bad RPN length (%d)\n", m->m_pkthdr.len);
