Skip to contentSkip to conversation

Bluetooth: Use min_t for calculating chan->mps

PATCH New [email protected] 1 participant 2 messages Dec 6, 2013

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH v3 1/2 Bluetooth: Use min_t for calculating chan->mps

From: Johan Hedberg <[email protected]>

Since there's a nice convenient helper for calculating the minimum of two values, let's use that one.

---
 net/bluetooth/l2cap_core.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
net/bluetooth/l2cap_core.c +1 -5
index 6e6f308af036..35feb9d6c322 100644
@@ -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);
 }
Signature · 1 line
1.8.4.2
#1 lore raw

PATCH v3 2/2 Bluetooth: Fix valid LE PSM check

From: Johan Hedberg <[email protected]>

The range of valid LE PSMs is 0x0001-0x00ff so the check should be for "less than or equal to" instead of "less than".

---
 net/bluetooth/l2cap_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
net/bluetooth/l2cap_core.c +1 -1
index 35feb9d6c322..ae0054ccee5b 100644
@@ -1851,7 +1851,7 @@ static bool is_valid_psm(u16 psm, u8 dst_type)
 		return false;
 
 	if (bdaddr_type_is_le(dst_type))
-		return (psm < 0x00ff);
+		return (psm <= 0x00ff);
 
 	/* PSM must be odd and lsb of upper byte must be 0 */
 	return ((psm & 0x0101) == 0x0001);
Signature · 1 line
1.8.4.2