diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2013-12-06 07:08:52 +0200 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2013-12-05 22:07:42 -0800 |
| commit | f1324ea50b2e48d30fbeac591771fdceac9315ca (patch) | |
| tree | 3f39856bab5fa82b37bd32ff365e09096cdd729b | |
| parent | 0ce43ce60d5e0c079d33be1fe33ba92828c7e5da (diff) | |
| download | linux-stable-f1324ea50b2e48d30fbeac591771fdceac9315ca.tar.gz linux-stable-f1324ea50b2e48d30fbeac591771fdceac9315ca.tar.bz2 linux-stable-f1324ea50b2e48d30fbeac591771fdceac9315ca.zip | |
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>
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 6 |
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) 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->mps = min_t(u16, chan->imtu, L2CAP_LE_DEFAULT_MPS); skb_queue_head_init(&chan->tx_q); } |