diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 17:42:49 +0100 |
| commit | c4d0a06860b8ade51836f07ae050245f9059c6d6 (patch) | |
| tree | 88931d8ccb3cc94bb2a895149ff18dfc448e3324 /net/bluetooth/l2cap_core.c | |
| parent | ebb7c3b1a10a2cd3986f2db60612d2c6fbb915ab (diff) | |
| parent | 1f76bce8544acd38f7bb1e822540f8ca521e1b7f (diff) | |
Merge remote-tracking branch 'jstultz-android/linaro-fixes/experimental/android-3.9' into merge-androidlsk-android-2013.06
Conflicts:
arch/arm/common/Makefile
arch/arm/include/asm/irq.h
arch/arm/include/asm/smp.h
arch/arm/kernel/smp.c
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
| -rw-r--r-- | net/bluetooth/l2cap_core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 7c7e9321f1e..adf65faa176 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c @@ -1684,10 +1684,10 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid, auth_type = l2cap_get_auth_type(chan); if (chan->dcid == L2CAP_CID_LE_DATA) - hcon = hci_connect(hdev, LE_LINK, dst, dst_type, + hcon = hci_connect(hdev, LE_LINK, 0, dst, dst_type, chan->sec_level, auth_type); else - hcon = hci_connect(hdev, ACL_LINK, dst, dst_type, + hcon = hci_connect(hdev, ACL_LINK, 0, dst, dst_type, chan->sec_level, auth_type); if (IS_ERR(hcon)) { |