diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:44:29 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-01-08 13:44:29 -0500 |
| commit | 300e5fd160114920079dd3ec132e5c01d00e4a1d (patch) | |
| tree | 6032c96747aeae7544be71e4f3b7e2866a21bb1c /net/bluetooth/hci_event.c | |
| parent | 6e08d757b72f280c45cfec61e63216adb419e2dd (diff) | |
| parent | e825eb1d7e06f616003c17e2e8e421c2e5e44142 (diff) | |
| download | op-kernel-dev-300e5fd160114920079dd3ec132e5c01d00e4a1d.zip op-kernel-dev-300e5fd160114920079dd3ec132e5c01d00e4a1d.tar.gz | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/hci_event.c')
| -rw-r--r-- | net/bluetooth/hci_event.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 5fb3df66..5f81245 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -3533,6 +3533,9 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) conn->handle = __le16_to_cpu(ev->handle); conn->state = BT_CONNECTED; + if (test_bit(HCI_6LOWPAN_ENABLED, &hdev->dev_flags)) + set_bit(HCI_CONN_6LOWPAN, &conn->flags); + hci_conn_add_sysfs(conn); hci_proto_connect_cfm(conn, ev->status); |
