Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus

[linux-2.6-omap-h63xx.git] / net / bluetooth / hci_conn.c

diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 6cd5711fa28a59265403a81f608e6698e7f03dfa..63980bd6b5f2e404f1b73f6163517767f0b1a349 100644 (file)
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -1,4 +1,4 @@
-/* 
+/*

    BlueZ - Bluetooth protocol stack for Linux
    Copyright (C) 2000-2001 Qualcomm Incorporated
 
    BlueZ - Bluetooth protocol stack for Linux
    Copyright (C) 2000-2001 Qualcomm Incorporated
 


@@ -12,13 +12,13 @@
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
    IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY
    OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS.
    IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY

-   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 
-   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 
-   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 
+   CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES
+   WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+   ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
    OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 

-   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 
-   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 
+   ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS,
+   COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS

    SOFTWARE IS DISCLAIMED.
 */
 
    SOFTWARE IS DISCLAIMED.
 */
 


@@ -29,7 +29,6 @@
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>

-#include <linux/sched.h>

 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>
 #include <linux/slab.h>
 #include <linux/poll.h>
 #include <linux/fcntl.h>


@@ -73,11 +72,11 @@ void hci_acl_connect(struct hci_conn *conn)
                        inquiry_entry_age(ie) <= INQUIRY_ENTRY_AGE_MAX) {
                cp.pscan_rep_mode = ie->data.pscan_rep_mode;
                cp.pscan_mode     = ie->data.pscan_mode;
                        inquiry_entry_age(ie) <= INQUIRY_ENTRY_AGE_MAX) {
                cp.pscan_rep_mode = ie->data.pscan_rep_mode;
                cp.pscan_mode     = ie->data.pscan_mode;

-               cp.clock_offset   = ie->data.clock_offset | __cpu_to_le16(0x8000);
+               cp.clock_offset   = ie->data.clock_offset | cpu_to_le16(0x8000);

                memcpy(conn->dev_class, ie->data.dev_class, 3);
        }
 
                memcpy(conn->dev_class, ie->data.dev_class, 3);
        }
 

-       cp.pkt_type = __cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK);
+       cp.pkt_type = cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK);

        if (lmp_rswitch_capable(hdev) && !(hdev->link_mode & HCI_LM_MASTER))
                cp.role_switch  = 0x01;
        else
        if (lmp_rswitch_capable(hdev) && !(hdev->link_mode & HCI_LM_MASTER))
                cp.role_switch  = 0x01;
        else


@@ -108,7 +107,7 @@ void hci_acl_disconn(struct hci_conn *conn, __u8 reason)
 
        conn->state = BT_DISCONN;
 
 
        conn->state = BT_DISCONN;
 

-       cp.handle = __cpu_to_le16(conn->handle);
+       cp.handle = cpu_to_le16(conn->handle);

        cp.reason = reason;
        hci_send_cmd(conn->hdev, OGF_LINK_CTL,
                                OCF_DISCONNECT, sizeof(cp), &cp);
        cp.reason = reason;
        hci_send_cmd(conn->hdev, OGF_LINK_CTL,
                                OCF_DISCONNECT, sizeof(cp), &cp);


@@ -124,8 +123,8 @@ void hci_add_sco(struct hci_conn *conn, __u16 handle)
        conn->state = BT_CONNECT;
        conn->out = 1;
 
        conn->state = BT_CONNECT;
        conn->out = 1;
 

-       cp.pkt_type = __cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
-       cp.handle   = __cpu_to_le16(handle);
+       cp.pkt_type = cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK);
+       cp.handle   = cpu_to_le16(handle);

 
        hci_send_cmd(hdev, OGF_LINK_CTL, OCF_ADD_SCO, sizeof(cp), &cp);
 }
 
        hci_send_cmd(hdev, OGF_LINK_CTL, OCF_ADD_SCO, sizeof(cp), &cp);
 }


@@ -146,7 +145,7 @@ static void hci_conn_timeout(unsigned long arg)
        case BT_CONNECT:
                hci_acl_connect_cancel(conn);
                break;
        case BT_CONNECT:
                hci_acl_connect_cancel(conn);
                break;

-       case BT_CONNECTED:
+       case BT_CONNECTED:

                hci_acl_disconn(conn, 0x13);
                break;
        default:
                hci_acl_disconn(conn, 0x13);
                break;
        default:


@@ -272,7 +271,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
                if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags))
                        continue;
 
                if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags))
                        continue;
 

-               /* Simple routing: 
+               /* Simple routing:

                 *   No source address - find interface with bdaddr != dst
                 *   Source address    - find interface with bdaddr == src
                 */
                 *   No source address - find interface with bdaddr != dst
                 *   Source address    - find interface with bdaddr == src
                 */


@@ -328,7 +327,7 @@ struct hci_conn * hci_connect(struct hci_dev *hdev, int type, bdaddr_t *dst)
 
                hci_conn_hold(sco);
 
 
                hci_conn_hold(sco);
 

-               if (acl->state == BT_CONNECTED && 
+               if (acl->state == BT_CONNECTED &&

                                (sco->state == BT_OPEN || sco->state == BT_CLOSED))
                        hci_add_sco(sco, acl->handle);
 
                                (sco->state == BT_OPEN || sco->state == BT_CLOSED))
                        hci_add_sco(sco, acl->handle);
 


@@ -349,7 +348,7 @@ int hci_conn_auth(struct hci_conn *conn)
 
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
                struct hci_cp_auth_requested cp;
 
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
                struct hci_cp_auth_requested cp;

-               cp.handle = __cpu_to_le16(conn->handle);
+               cp.handle = cpu_to_le16(conn->handle);

                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_AUTH_REQUESTED, sizeof(cp), &cp);
        }
        return 0;
                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_AUTH_REQUESTED, sizeof(cp), &cp);
        }
        return 0;


@@ -369,8 +368,8 @@ int hci_conn_encrypt(struct hci_conn *conn)
 
        if (hci_conn_auth(conn)) {
                struct hci_cp_set_conn_encrypt cp;
 
        if (hci_conn_auth(conn)) {
                struct hci_cp_set_conn_encrypt cp;

-               cp.handle  = __cpu_to_le16(conn->handle);
-               cp.encrypt = 1; 
+               cp.handle  = cpu_to_le16(conn->handle);
+               cp.encrypt = 1;

                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp);
        }
        return 0;
                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp);
        }
        return 0;


@@ -384,7 +383,7 @@ int hci_conn_change_link_key(struct hci_conn *conn)
 
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
                struct hci_cp_change_conn_link_key cp;
 
        if (!test_and_set_bit(HCI_CONN_AUTH_PEND, &conn->pend)) {
                struct hci_cp_change_conn_link_key cp;

-               cp.handle = __cpu_to_le16(conn->handle);
+               cp.handle = cpu_to_le16(conn->handle);

                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_CHANGE_CONN_LINK_KEY, sizeof(cp), &cp);
        }
        return 0;
                hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_CHANGE_CONN_LINK_KEY, sizeof(cp), &cp);
        }
        return 0;


@@ -424,7 +423,7 @@ void hci_conn_enter_active_mode(struct hci_conn *conn)
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
                struct hci_cp_exit_sniff_mode cp;
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
                struct hci_cp_exit_sniff_mode cp;

-               cp.handle = __cpu_to_le16(conn->handle);
+               cp.handle = cpu_to_le16(conn->handle);

                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_EXIT_SNIFF_MODE, sizeof(cp), &cp);
        }
                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_EXIT_SNIFF_MODE, sizeof(cp), &cp);
        }


@@ -453,21 +452,21 @@ void hci_conn_enter_sniff_mode(struct hci_conn *conn)
 
        if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {
                struct hci_cp_sniff_subrate cp;
 
        if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {
                struct hci_cp_sniff_subrate cp;

-               cp.handle             = __cpu_to_le16(conn->handle);
-               cp.max_latency        = __constant_cpu_to_le16(0);
-               cp.min_remote_timeout = __constant_cpu_to_le16(0);
-               cp.min_local_timeout  = __constant_cpu_to_le16(0);
+               cp.handle             = cpu_to_le16(conn->handle);
+               cp.max_latency        = cpu_to_le16(0);
+               cp.min_remote_timeout = cpu_to_le16(0);
+               cp.min_local_timeout  = cpu_to_le16(0);

                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_SNIFF_SUBRATE, sizeof(cp), &cp);
        }
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
                struct hci_cp_sniff_mode cp;
                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_SNIFF_SUBRATE, sizeof(cp), &cp);
        }
 
        if (!test_and_set_bit(HCI_CONN_MODE_CHANGE_PEND, &conn->pend)) {
                struct hci_cp_sniff_mode cp;

-               cp.handle       = __cpu_to_le16(conn->handle);
-               cp.max_interval = __cpu_to_le16(hdev->sniff_max_interval);
-               cp.min_interval = __cpu_to_le16(hdev->sniff_min_interval);
-               cp.attempt      = __constant_cpu_to_le16(4);
-               cp.timeout      = __constant_cpu_to_le16(1);
+               cp.handle       = cpu_to_le16(conn->handle);
+               cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);
+               cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);
+               cp.attempt      = cpu_to_le16(4);
+               cp.timeout      = cpu_to_le16(1);

                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_SNIFF_MODE, sizeof(cp), &cp);
        }
                hci_send_cmd(hdev, OGF_LINK_POLICY,
                                OCF_SNIFF_MODE, sizeof(cp), &cp);
        }