Hi Mat, * Mat Martineau <[email protected]> [2010-08-04 15:49:01 -0700]:
> Incoming configuration values must be converted to native CPU order > before use. This fixes a bug where a little-endian MPS value is > compared to a native CPU value. On big-endian processors, this > can cause ERTM and streaming mode segmentation to produce PDUs > that are larger than the remote stack is expecting, or that would > produce fragmented skbs that the current FCS code cannot handle. > > Signed-off-by: Mat Martineau <[email protected]> > --- > net/bluetooth/l2cap.c | 9 ++++----- > 1 files changed, 4 insertions(+), 5 deletions(-) > > diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c > index 920a53f..8cf9569 100644 > --- a/net/bluetooth/l2cap.c > +++ b/net/bluetooth/l2cap.c > @@ -2708,10 +2708,10 @@ done: > case L2CAP_MODE_ERTM: > pi->remote_tx_win = rfc.txwin_size; > pi->remote_max_tx = rfc.max_transmit; > - if (rfc.max_pdu_size > pi->conn->mtu - 10) > - rfc.max_pdu_size = le16_to_cpu(pi->conn->mtu - > 10); > > pi->remote_mps = le16_to_cpu(rfc.max_pdu_size); > + if (pi->remote_mps > pi->conn->mtu - 10) > + pi->remote_mps = pi->conn->mtu - 10; What happened with thte "rfc.max_pdu_size =" attribution. We have the send the value to through the RFC option. So what I do propose here is: diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c index 0f34e12..11d4405 100644 --- a/net/bluetooth/l2cap.c +++ b/net/bluetooth/l2cap.c @@ -2705,7 +2705,7 @@ done: case L2CAP_MODE_ERTM: pi->remote_tx_win = rfc.txwin_size; pi->remote_max_tx = rfc.max_transmit; - if (rfc.max_pdu_size > pi->conn->mtu - 10) + if (le16_to_cpu(rfc.max_pdu_size) > pi->conn->mtu - 10) rfc.max_pdu_size = le16_to_cpu(pi->conn->mtu - 10); pi->remote_mps = le16_to_cpu(rfc.max_pdu_size); @@ -2723,7 +2723,7 @@ done: break; case L2CAP_MODE_STREAMING: - if (rfc.max_pdu_size > pi->conn->mtu - 10) + if (le16_to_cpu(rfc.max_pdu_size) > pi->conn->mtu - 10) rfc.max_pdu_size = le16_to_cpu(pi->conn->mtu - 10); pi->remote_mps = le16_to_cpu(rfc.max_pdu_size); > > rfc.retrans_timeout = > le16_to_cpu(L2CAP_DEFAULT_RETRANS_TO); > @@ -2726,10 +2726,9 @@ done: > break; > > case L2CAP_MODE_STREAMING: > - if (rfc.max_pdu_size > pi->conn->mtu - 10) > - rfc.max_pdu_size = le16_to_cpu(pi->conn->mtu - > 10); > - > pi->remote_mps = le16_to_cpu(rfc.max_pdu_size); > + if (pi->remote_mps > pi->conn->mtu - 10) > + pi->remote_mps = pi->conn->mtu - 10; > > pi->conf_state |= L2CAP_CONF_MODE_DONE; -- Gustavo F. Padovan http://padovan.org -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
