diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-08 22:45:56 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-08 22:45:56 -0800 |
commit | 44bfce5c3ec91baf8ffcd075c66711740f29a949 (patch) | |
tree | f11621b66679902ecc84434f987d50c3609f0194 /net/bluetooth/hci_event.c | |
parent | bcf4d812e66ee95f762b38063d654fd1ff7156b0 (diff) | |
parent | 15c697ce1c5b408c5e20dcdc6aea2968d1125b75 (diff) | |
download | linux-44bfce5c3ec91baf8ffcd075c66711740f29a949.tar.gz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_event.c')
-rw-r--r-- | net/bluetooth/hci_event.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 28517bad796c..592da5c909c1 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c @@ -1699,6 +1699,7 @@ static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct sk_bu break; case 0x1c: /* SCO interval rejected */ + case 0x1a: /* Unsupported Remote Feature */ case 0x1f: /* Unspecified error */ if (conn->out && conn->attempt < 2) { conn->pkt_type = (hdev->esco_type & SCO_ESCO_MASK) | |