Johan Hedberg 84bc0db53b Bluetooth: Don't take any action in smp_resume_cb if not encrypted ... When smp_resume_cb is called if we're not encrypted (i.e. the callback wasn't called because the connection became encrypted) we shouldn't take any action at all. This patch moves also the security_timer cancellation behind this condition. Signed-off-by: Johan Hedberg <johan.hedberg@intel.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>		2014-09-08 19:07:55 +02:00
..
6lowpan	6lowpan: Allow 6LoWPAN to be modular	2014-08-07 11:44:18 -07:00
9p
802
8021q	net: Always untag vlan-tagged traffic on input.	2014-08-11 12:16:51 -07:00
appletalk
atm	lec: Use rtnl lock/unlock when updating MTU	2014-08-21 16:31:23 -07:00
ax25
batman-adv	batman-adv: Fix parameter order of hlist_add_behind	2014-08-16 19:19:08 -07:00
bluetooth	Bluetooth: Don't take any action in smp_resume_cb if not encrypted	2014-09-08 19:07:55 +02:00
bridge	net: Always untag vlan-tagged traffic on input.	2014-08-11 12:16:51 -07:00
caif
can
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2014-08-13 17:43:29 -06:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2014-08-13 18:27:40 -06:00
dcb	dcbnl : Fix misleading dcb_app->priority explanation	2014-07-30 17:21:05 -07:00
dccp
decnet
dns_resolver	Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security	2014-08-06 08:06:39 -07:00
dsa
ethernet
hsr
ieee802154	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-09-08 11:14:56 -04:00
ipv4	tcp: fix ssthresh and undo for consecutive short FRTO episodes	2014-08-14 14:38:55 -07:00
ipv6	net: ipv6: fib: don't sleep inside atomic lock	2014-08-22 10:54:49 -07:00
ipx
irda	irda: Fix rd_frame control field initialization in irlap_send_rd_frame()	2014-08-13 20:05:52 -07:00
iucv	af_iucv: avoid path quiesce of severed path in shutdown()	2014-07-21 20:21:40 -07:00
key
l2tp	net: use inet6_iif instead of IP6CB()->iif	2014-07-31 22:37:06 -07:00
lapb
llc
mac80211	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-09-08 11:14:56 -04:00
mac802154	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless	2014-09-08 11:14:56 -04:00
mpls
netfilter	netfilter: nf_tables: fix error return code	2014-08-08 16:47:29 +02:00
netlabel	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-08-06 09:38:14 -07:00
netlink	netlink: Annotate RCU locking for seq_file walker	2014-08-14 15:13:40 -07:00
netrom
nfc	Merge tag 'master-2014-07-31' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next	2014-08-05 13:18:20 -07:00
openvswitch	openvswitch: fix panic with multiple vlan headers	2014-08-22 11:24:04 -07:00
packet	packet: handle too big packets for PACKET_V3	2014-08-21 16:44:28 -07:00
phonet
rds
rfkill	net: rfkill: gpio: Add more Broadcom bluetooth ACPI IDs	2014-08-29 13:10:44 +02:00
rose
rxrpc	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next	2014-08-06 09:38:14 -07:00
sched	cbq: now_rt removal	2014-08-19 10:58:44 -07:00
sctp	net: sctp: fix suboptimal edge-case on non-active active/retrans path selection	2014-08-22 11:31:30 -07:00
sunrpc	NFS client updates for Linux 3.17	2014-08-13 18:13:19 -06:00
tipc	tipc: Fix build.	2014-08-19 11:16:38 -07:00
unix
vmw_vsock
wimax
wireless	Not that much content this time. Some RCU cleanups, crypto	2014-09-04 13:41:33 -04:00
x25
xfrm	list: fix order of arguments for hlist_add_after(_rcu)	2014-08-06 18:01:24 -07:00
compat.c	net: sendmsg: fix NULL pointer dereference	2014-07-29 12:20:22 -07:00
Kconfig
Makefile
nonet.c
socket.c	net-timestamp: sock_tx_timestamp() fix	2014-08-06 12:38:07 -07:00
sysctl_net.c