Hi, On Fri, Dec 06, 2013, johan.hedberg@xxxxxxxxx wrote: > Since there's a nice convenient helper for calculating the minimum of > two values, let's use that one. > > Signed-off-by: Johan Hedberg <johan.hedberg@xxxxxxxxx> > --- > net/bluetooth/l2cap_core.c | 6 +----- > 1 file changed, 1 insertion(+), 5 deletions(-) > > diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c > index 6e6f308af036..8f42cae96dc3 100644 > --- a/net/bluetooth/l2cap_core.c > +++ b/net/bluetooth/l2cap_core.c > @@ -505,11 +505,7 @@ static void l2cap_le_flowctl_init(struct l2cap_chan *chan) > chan->sdu_len = 0; > chan->tx_credits = 0; > chan->rx_credits = le_max_credits; > - > - if (chan->imtu < L2CAP_LE_DEFAULT_MPS) > - chan->mps = chan->imtu; > - else > - chan->mps = L2CAP_LE_DEFAULT_MPS; > + chan->imtu = min_t(u16, chan->imtu, L2CAP_LE_DEFAULT_MPS); Ignore this one. It should obviously be assigning to chan->mps and not chan->imtu. Johan -- To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
