summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMarcel Holtmann <marcel@holtmann.org>2006-11-18 22:15:00 +0100
committerDavid S. Miller <davem@sunset.davemloft.net>2006-11-21 16:16:31 -0800
commit820ae1b865caa05e0614004d0183ca70de2b8665 (patch)
treecf93320889db023d4049ffc0123bcfb4a407982f /net
parentff2d367ac33b9278c9516ac1888207dac11d10b0 (diff)
downloadlinux-stable-820ae1b865caa05e0614004d0183ca70de2b8665.tar.gz
linux-stable-820ae1b865caa05e0614004d0183ca70de2b8665.tar.bz2
linux-stable-820ae1b865caa05e0614004d0183ca70de2b8665.zip
[Bluetooth] Always include MTU in L2CAP config responses
When sending a positive config response it shall include the actual MTU to be used on this channel. This differs from the Bluetooth 1.1 specification where it was enough to acknowledge the config request. Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/bluetooth/l2cap.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index 2b3dcb8f90fa..c09d4a20d696 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -1353,12 +1353,12 @@ static inline int l2cap_conf_output(struct sock *sk, void **ptr)
/* Configure output options and let the other side know
* which ones we don't like. */
- if (pi->conf_mtu < pi->omtu) {
- l2cap_add_conf_opt(ptr, L2CAP_CONF_MTU, 2, pi->omtu);
+ if (pi->conf_mtu < pi->omtu)
result = L2CAP_CONF_UNACCEPT;
- } else {
+ else
pi->omtu = pi->conf_mtu;
- }
+
+ l2cap_add_conf_opt(ptr, L2CAP_CONF_MTU, 2, pi->omtu);
BT_DBG("sk %p result %d", sk, result);
return result;