diff options
author | YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> | 2007-02-09 09:24:33 -0500 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-02-11 02:19:20 -0500 |
commit | 8e87d14255acffeee36873de226dc25c11b5f46d (patch) | |
tree | e11c179c8db4ae3ad56ea02d583bc041dcc686b6 /net/bluetooth/hci_conn.c | |
parent | 528930b91ee89a05a6264629cf99109652c19ca8 (diff) |
[NET] BLUETOOTH: Fix whitespace errors.
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bluetooth/hci_conn.c')
-rw-r--r-- | net/bluetooth/hci_conn.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c index 6cd5711fa28a..67ee0bd80f5f 100644 --- a/net/bluetooth/hci_conn.c +++ b/net/bluetooth/hci_conn.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* | 1 | /* |
2 | BlueZ - Bluetooth protocol stack for Linux | 2 | BlueZ - Bluetooth protocol stack for Linux |
3 | Copyright (C) 2000-2001 Qualcomm Incorporated | 3 | Copyright (C) 2000-2001 Qualcomm Incorporated |
4 | 4 | ||
@@ -12,13 +12,13 @@ | |||
12 | OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | 12 | OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, |
13 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. | 13 | FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. |
14 | IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY | 14 | IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY |
15 | CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES | 15 | CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES |
16 | WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | 16 | WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
17 | ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | 17 | ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
18 | OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | 18 | OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
19 | 19 | ||
20 | ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, | 20 | ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, |
21 | COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS | 21 | COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS |
22 | SOFTWARE IS DISCLAIMED. | 22 | SOFTWARE IS DISCLAIMED. |
23 | */ | 23 | */ |
24 | 24 | ||
@@ -146,7 +146,7 @@ static void hci_conn_timeout(unsigned long arg) | |||
146 | case BT_CONNECT: | 146 | case BT_CONNECT: |
147 | hci_acl_connect_cancel(conn); | 147 | hci_acl_connect_cancel(conn); |
148 | break; | 148 | break; |
149 | case BT_CONNECTED: | 149 | case BT_CONNECTED: |
150 | hci_acl_disconn(conn, 0x13); | 150 | hci_acl_disconn(conn, 0x13); |
151 | break; | 151 | break; |
152 | default: | 152 | default: |
@@ -272,7 +272,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) | |||
272 | if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags)) | 272 | if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags)) |
273 | continue; | 273 | continue; |
274 | 274 | ||
275 | /* Simple routing: | 275 | /* Simple routing: |
276 | * No source address - find interface with bdaddr != dst | 276 | * No source address - find interface with bdaddr != dst |
277 | * Source address - find interface with bdaddr == src | 277 | * Source address - find interface with bdaddr == src |
278 | */ | 278 | */ |
@@ -328,7 +328,7 @@ struct hci_conn * hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst) | |||
328 | 328 | ||
329 | hci_conn_hold(sco); | 329 | hci_conn_hold(sco); |
330 | 330 | ||
331 | if (acl->state == BT_CONNECTED && | 331 | if (acl->state == BT_CONNECTED && |
332 | (sco->state == BT_OPEN || sco->state == BT_CLOSED)) | 332 | (sco->state == BT_OPEN || sco->state == BT_CLOSED)) |
333 | hci_add_sco(sco, acl->handle); | 333 | hci_add_sco(sco, acl->handle); |
334 | 334 | ||
@@ -370,7 +370,7 @@ int hci_conn_encrypt(struct hci_conn *conn) | |||
370 | if (hci_conn_auth(conn)) { | 370 | if (hci_conn_auth(conn)) { |
371 | struct hci_cp_set_conn_encrypt cp; | 371 | struct hci_cp_set_conn_encrypt cp; |
372 | cp.handle = __cpu_to_le16(conn->handle); | 372 | cp.handle = __cpu_to_le16(conn->handle); |
373 | cp.encrypt = 1; | 373 | cp.encrypt = 1; |
374 | hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp); | 374 | hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp); |
375 | } | 375 | } |
376 | return 0; | 376 | return 0; |