Hi Mat, * Marcel Holtmann <[email protected]> [2010-08-02 12:38:32 -0700]:
> Hi Mat, > > > Signed-off-by: Mat Martineau <[email protected]> > > --- > > net/bluetooth/l2cap.c | 12 ++++++++---- > > 1 files changed, 8 insertions(+), 4 deletions(-) > > > > diff --git a/net/bluetooth/l2cap.c b/net/bluetooth/l2cap.c > > index 9ba1e8e..aed72f2 100644 > > --- a/net/bluetooth/l2cap.c > > +++ b/net/bluetooth/l2cap.c > > @@ -3127,8 +3127,10 @@ static inline int l2cap_config_req(struct l2cap_conn > > *conn, struct l2cap_cmd_hdr > > goto unlock; > > > > if (l2cap_pi(sk)->conf_state & L2CAP_CONF_INPUT_DONE) { > > - if (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) || > > - l2cap_pi(sk)->fcs != L2CAP_FCS_NONE) > > + if ((l2cap_pi(sk)->mode == L2CAP_MODE_ERTM || > > + l2cap_pi(sk)->mode == L2CAP_MODE_STREAMING) && > > + (!(l2cap_pi(sk)->conf_state & L2CAP_CONF_NO_FCS_RECV) || > > + l2cap_pi(sk)->fcs != L2CAP_FCS_NONE)) > > l2cap_pi(sk)->fcs = L2CAP_FCS_CRC16; > > this becomes unreadable and my brain starts to throw a core dump. So it > clearly needs to be put into a helper inline function. Actually we don't need that, since the code that deals with Basic Mode never check and use the l2cap_pi(sk)->fcs. So we don't care about FCS value in the Basic Mode. -- 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
