summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Emeltchenko <andrei.emeltchenko@nokia.com>2010-09-01 15:17:25 +0300
committerGustavo F. Padovan <padovan@profusion.mobi>2010-09-30 12:19:35 -0300
commit8183b775bc5b79b6b1e250019c9dd930554dfa94 (patch)
treecdd7ec2b4a8d0507a4ea51e1db393f6275e0cec0
parent8c462b6047da80491b8cb6be878e8bf9313ac3e1 (diff)
downloadlinux-3.10-8183b775bc5b79b6b1e250019c9dd930554dfa94.tar.gz
linux-3.10-8183b775bc5b79b6b1e250019c9dd930554dfa94.tar.bz2
linux-3.10-8183b775bc5b79b6b1e250019c9dd930554dfa94.zip
Bluetooth: fix MTU L2CAP configuration parameter
When receiving L2CAP negative configuration response with respect to MTU parameter we modify wrong field. MTU here means proposed value of MTU that the remote device intends to transmit. So for local L2CAP socket it is pi->imtu. Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com> Acked-by: Ville Tervo <ville.tervo@nokia.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
-rw-r--r--net/bluetooth/l2cap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c
index c7847035562..9fad312e53f 100644
--- a/net/bluetooth/l2cap.c
+++ b/net/bluetooth/l2cap.c
@@ -2771,10 +2771,10 @@ static int l2cap_parse_conf_rsp(struct sock *sk, void *rsp, int len, void *data,
case L2CAP_CONF_MTU:
if (val < L2CAP_DEFAULT_MIN_MTU) {
*result = L2CAP_CONF_UNACCEPT;
- pi->omtu = L2CAP_DEFAULT_MIN_MTU;
+ pi->imtu = L2CAP_DEFAULT_MIN_MTU;
} else
- pi->omtu = val;
- l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->omtu);
+ pi->imtu = val;
+ l2cap_add_conf_opt(&ptr, L2CAP_CONF_MTU, 2, pi->imtu);
break;
case L2CAP_CONF_FLUSH_TO: