diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-08 09:03:10 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-08 09:03:10 -0500 |
| commit | c1f3bb6bd317994beb3af7bbec4bf54ed0035509 (patch) | |
| tree | 878833c714ddcb35f1574f2b11e1f69d1130d206 /net/bluetooth/smp.c | |
| parent | dcd607718385d02ce3741de225927a57f528f93b (diff) | |
| parent | 3c57e865cfb2dcbb48fdfa08e7d4e3479e9b40f0 (diff) | |
| download | blackbird-op-linux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.tar.gz blackbird-op-linux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/bluetooth/smp.c')
| -rw-r--r-- | net/bluetooth/smp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 463e50c58716..85a2796cac61 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) { @@ -864,7 +864,7 @@ int smp_sig_channel(struct l2cap_conn *conn, struct sk_buff *skb) return -EILSEQ; } - if (!test_bit(HCI_LE_ENABLED, &conn->hcon->hdev->dev_flags)) { + if (!test_bit(HCI_LE_ENABLED, &hcon->hdev->dev_flags)) { err = -ENOTSUPP; reason = SMP_PAIRING_NOTSUPP; goto done; |
