Johan Hedberg 9f22398ce4 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>		2013-06-23 00:23:48 +01:00
..
9p	Lots of virtio work which wasn't quite ready for last merge window. Plus	2013-05-02 14:14:04 -07:00
802	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
8021q	net: vlan,ethtool: netdev_features_t is more than 32 bit	2013-05-02 13:58:12 -04:00
appletalk	appletalk: info leak in ->getname()	2013-04-25 01:47:58 -04:00
atm	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ax25
batman-adv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
bluetooth	Bluetooth: Fix hardcoding ATT CID in __l2cap_chan_add()	2013-06-23 00:23:48 +01:00
bridge	bridge: fix race with topology change timer	2013-05-03 16:08:58 -04:00
caif	caif: Remove bouncing address for Daniel Martensson	2013-04-23 13:25:51 -04:00
can	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ceph	libceph: use slab cache for osd client requests	2013-05-02 11:58:41 -05:00
core	gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol()	2013-05-08 13:13:30 -07:00
dcb
dccp
decnet
dns_resolver
dsa
ethernet
ieee802154
ipv4	gso: Handle Trans-Ether-Bridging protocol in skb_network_protocol()	2013-05-08 13:13:30 -07:00
ipv6	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
ipx
irda	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
iucv	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-22 20:32:51 -04:00
key
l2tp
lapb
llc
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2013-06-18 14:04:51 -04:00
mac802154	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
netfilter	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-05-01 17:51:54 -07:00
netlabel
netlink	netlink: kconfig: move mmap i/o into netlink kconfig	2013-05-01 15:02:42 -04:00
netrom	netrom: info leak in ->getname()	2013-04-25 01:47:58 -04:00
nfc	NFC: llcp: Fix the well known services endianness	2013-06-14 13:45:10 +02:00
openvswitch	openvswitch: Remove unneeded ovs_netdev_get_ifindex()	2013-04-30 00:19:11 -04:00
packet	packet: tpacket_v3: do not trigger bug() on wrong header status	2013-05-03 16:10:33 -04:00
phonet
rds
rfkill	Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next	2013-04-22 14:58:14 -04:00
rose
rxrpc
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
sctp	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2013-05-01 14:08:52 -07:00
sunrpc	Merge branch 'for-3.10' of git://linux-nfs.org/~bfields/linux	2013-05-10 09:28:55 -07:00
tipc	tipc: potential divide by zero in tipc_link_recv_fragment()	2013-05-06 16:16:52 -04:00
unix	af_unix: fix a fatal race with bit fields	2013-05-01 15:13:49 -04:00
vmw_vsock	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-30 03:55:20 -04:00
wimax
wireless	cfg80211: fix rtnl leak in wiphy dump error cases	2013-06-11 16:52:39 +02:00
x25
xfrm	Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6	2013-05-02 14:53:12 -07:00
compat.c
Kconfig	netlink: kconfig: move mmap i/o into netlink kconfig	2013-05-01 15:02:42 -04:00
Makefile
nonet.c
socket.c	Merge git://git.infradead.org/users/eparis/audit	2013-05-11 14:29:11 -07:00
sysctl_net.c