aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorJohan Hedberg <johan.hedberg@intel.com>2013-12-06 00:08:52 -0500
committerMarcel Holtmann <marcel@holtmann.org>2013-12-06 01:07:42 -0500
commitf1324ea50b2e48d30fbeac591771fdceac9315ca (patch)
tree3f39856bab5fa82b37bd32ff365e09096cdd729b /net/bluetooth
parent0ce43ce60d5e0c079d33be1fe33ba92828c7e5da (diff)
Bluetooth: Use min_t for calculating chan->mps
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@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/l2cap_core.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index 6e6f308af036..35feb9d6c322 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)
505 chan->sdu_len = 0; 505 chan->sdu_len = 0;
506 chan->tx_credits = 0; 506 chan->tx_credits = 0;
507 chan->rx_credits = le_max_credits; 507 chan->rx_credits = le_max_credits;
508 508 chan->mps = min_t(u16, chan->imtu, L2CAP_LE_DEFAULT_MPS);
509 if (chan->imtu < L2CAP_LE_DEFAULT_MPS)
510 chan->mps = chan->imtu;
511 else
512 chan->mps = L2CAP_LE_DEFAULT_MPS;
513 509
514 skb_queue_head_init(&chan->tx_q); 510 skb_queue_head_init(&chan->tx_q);
515} 511}