]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add()
authorJohan Hedberg <johan.hedberg@intel.com>
Mon, 29 Apr 2013 16:35:38 +0000 (19:35 +0300)
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>
Fri, 3 May 2013 19:09:42 +0000 (16:09 -0300)
commit99e84377f39065dbe9c77b352cf231b6e772ad10
tree806b8a240c6ae45e2ea1536d1ae2f814cd9f823e
parent293732db00cc946c44160cc45e402d83f159df0a
Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add()

Since in the future more than the ATT CID may be permissible we should
not be hardcoding it for all LE connections in __l2cap_chan_add().
Instead, the source ATT CID should only be set if the destination is
also ATT, and in other cases we should just use the existing dynamic CID
allocation function.

Assigning scid based on dcid means that whenever __l2cap_chan_add() is
called that chan->dcid is properly initialized. l2cap_le_conn_ready()
wasn't initializing is properly so this is also taken care of in this
patch.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
net/bluetooth/l2cap_core.c