diff options
| author | Johan Hedberg <johan.hedberg@intel.com> | 2016-01-26 23:19:10 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2016-01-29 11:47:24 +0100 |
| commit | 92594a51120ebc6c2f556204fc73568c8f7cb0f4 (patch) | |
| tree | e45cbb4efa38166fe6aa38359ccf78ae4959c7f2 /net | |
| parent | Bluetooth: L2CAP: Introduce proper defines for PSM ranges (diff) | |
| download | linux-92594a51120ebc6c2f556204fc73568c8f7cb0f4.tar.xz linux-92594a51120ebc6c2f556204fc73568c8f7cb0f4.zip | |
Bluetooth: L2CAP: Fix auto-allocating LE PSM values
The LE dynamic PSM range is different from BR/EDR (0x0080 - 0x00ff)
and doesn't have requirements relating to parity, so separate checks
are needed.
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 39a5149f3010..eb4f5f24cbe3 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -197,10 +197,20 @@ int l2cap_add_psm(struct l2cap_chan *chan, bdaddr_t *src, __le16 psm) chan->sport = psm; err = 0; } else { - u16 p; + u16 p, start, end, incr; + + if (chan->src_type == BDADDR_BREDR) { + start = L2CAP_PSM_DYN_START; + end = L2CAP_PSM_AUTO_END; + incr = 2; + } else { + start = L2CAP_PSM_LE_DYN_START; + end = L2CAP_PSM_LE_DYN_END; + incr = 1; + } err = -EINVAL; - for (p = 0x1001; p < 0x1100; p += 2) + for (p = start; p <= end; p += incr) if (!__l2cap_global_chan_by_addr(cpu_to_le16(p), src)) { chan->psm = cpu_to_le16(p); chan->sport = cpu_to_le16(p); |