summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohan Hedberg2013-10-16 10:37:01 +0200
committerMarcel Holtmann2013-10-16 10:41:13 +0200
commit3432711f49c31c8f21f8a9beb0b3d4b2c7bc9dc2 (patch)
tree6fc07f41305210d4b02c2e1774020dabee2c61c9 /net
parentBluetooth: Ignore A2MP data on non-BR/EDR links (diff)
downloadkernel-qcow2-linux-3432711f49c31c8f21f8a9beb0b3d4b2c7bc9dc2.tar.gz
kernel-qcow2-linux-3432711f49c31c8f21f8a9beb0b3d4b2c7bc9dc2.tar.xz
kernel-qcow2-linux-3432711f49c31c8f21f8a9beb0b3d4b2c7bc9dc2.zip
Bluetooth: Ignore SMP data on non-LE links
The SMP CID is only defined for LE transports. Instead of returning an error from smp_sig_channel() in this case (which would cause a disconnection) just return 0 to ignore the data, which is consistent with the behavior for other unknown CIDs. 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/smp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c
index 463e50c58716..fc200e06aa04 100644
--- a/net/bluetooth/smp.c
+++ b/net/bluetooth/smp.c
@@ -856,7 +856,7 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb)
if (hcon->type != LE_LINK) {
kfree_skb(skb);
- return -ENOTSUPP;
+ return 0;
}
if (skb->len < 1) {