diff options
| author | Marcel Holtmann <linux-bt.adm@hostme.bitkeeper.com> | 2003-03-24 06:36:34 -0800 |
|---|---|---|
| committer | Marcel Holtmann <linux-bt.adm@hostme.bitkeeper.com> | 2003-03-24 06:36:34 -0800 |
| commit | 167ee5b6d1c5c2191a751c94293bd131936fa200 (patch) | |
| tree | bb97a7cb9379ca5424f027753567a8f6d0c4b9ad | |
| parent | 0d8865bdc8aa5794b2089265347b7856fd669a38 (diff) | |
| parent | d3d1da7005ff1deaeddd2a11e7f85d13676e9316 (diff) | |
Merge hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.5
into hostme.bitkeeper.com:/ua/repos/l/linux-bt/marcel-2.5
| -rw-r--r-- | drivers/bluetooth/hci_usb.c | 3 | ||||
| -rw-r--r-- | net/bluetooth/hci_conn.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_usb.c b/drivers/bluetooth/hci_usb.c index 4f8cec4fedee..5925011faa47 100644 --- a/drivers/bluetooth/hci_usb.c +++ b/drivers/bluetooth/hci_usb.c @@ -80,6 +80,9 @@ static struct usb_device_id bluetooth_ids[] = { /* Ericsson with non-standard id */ { USB_DEVICE(0x0bdb, 0x1002) }, + /* Bluetooth Ultraport Module from IBM */ + { USB_DEVICE(0x04bf, 0x030a) }, + { } /* Terminating entry */ }; diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 416b164db547..dca73e34a16f 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c @@ -71,6 +71,7 @@ void hci_acl_connect(struct hci_conn *conn) memset(&cp, 0, sizeof(cp)); bacpy(&cp.bdaddr, &conn->dst); + cp.pscan_rep_mode = 0x01; if ((ie = inquiry_cache_lookup(hdev, &conn->dst)) && inquiry_entry_age(ie) <= INQUIRY_ENTRY_AGE_MAX) { |