Bluetooth: Use min_t for calculating chan->imtu
Subsystems (2)
PATCH v2 1/2 Bluetooth: Use min_t for calculating chan->imtu
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
@@ -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
PATCH v2 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
@@ -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
Marcel Holtmann
maintainerRe: [PATCH v2 2/2] Bluetooth: Fix valid LE PSM check
Hi Johan,
Quoted 7 lines
The range of valid LE PSMs is 0x0001-0x00ff so the check should be for "less than or equal to" instead of "less than".
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/l2cap_core.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Marcel Holtmann
maintainerHi Johan,
Quoted 7 lines
Since there's a nice convenient helper for calculating the minimum of two values, let's use that one.
Signed-off-by Johan Hedberg <[email protected]>---
net/bluetooth/l2cap_core.c| 6 +-----1 file changed, 1 insertion(+), 5 deletions(-)
patch has been applied to bluetooth-next tree.
Regards
Marcel
Hi,
Quoted 7 lines · On Fri, Dec 06, 2013, [email protected] 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 <[email protected]>--- net/bluetooth/l2cap_core.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
Too early in the morning for me - sending a v3 with a proper subject (with mps instead of imtu in it).
Johan