aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorSzymon Janc <szymon.janc@tieto.com>2011-02-17 10:44:23 -0500
committerGustavo F. Padovan <padovan@profusion.mobi>2011-02-17 11:34:50 -0500
commit138d22ef14bf00e44de7885cd03f0c3b6ac168f5 (patch)
tree71828cb1860ae8b1b16b288166d074b3418f56e0 /net/bluetooth
parent01df8c31d152493ddc58a0bd1719eac6759add87 (diff)
Bluetooth: Fix some code style issues in hci_event.c
Signed-off-by: Szymon Janc <szymon.janc@tieto.com> Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hci_event.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1741936ddacf..98b5764e4315 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -938,7 +938,7 @@ static void hci_cs_set_conn_encrypt(struct hci_dev *hdev, __u8 status)
938} 938}
939 939
940static int hci_outgoing_auth_needed(struct hci_dev *hdev, 940static int hci_outgoing_auth_needed(struct hci_dev *hdev,
941 struct hci_conn *conn) 941 struct hci_conn *conn)
942{ 942{
943 if (conn->state != BT_CONFIG || !conn->out) 943 if (conn->state != BT_CONFIG || !conn->out)
944 return 0; 944 return 0;
@@ -1293,7 +1293,8 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *sk
1293 1293
1294 mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type); 1294 mask |= hci_proto_connect_ind(hdev, &ev->bdaddr, ev->link_type);
1295 1295
1296 if ((mask & HCI_LM_ACCEPT) && !hci_blacklist_lookup(hdev, &ev->bdaddr)) { 1296 if ((mask & HCI_LM_ACCEPT) &&
1297 !hci_blacklist_lookup(hdev, &ev->bdaddr)) {
1297 /* Connection accepted */ 1298 /* Connection accepted */
1298 struct inquiry_entry *ie; 1299 struct inquiry_entry *ie;
1299 struct hci_conn *conn; 1300 struct hci_conn *conn;
@@ -2101,7 +2102,8 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, struct
2101 hci_dev_lock(hdev); 2102 hci_dev_lock(hdev);
2102 2103
2103 if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) { 2104 if ((skb->len - 1) / num_rsp != sizeof(struct inquiry_info_with_rssi)) {
2104 struct inquiry_info_with_rssi_and_pscan_mode *info = (void *) (skb->data + 1); 2105 struct inquiry_info_with_rssi_and_pscan_mode *info;
2106 info = (void *) (skb->data + 1);
2105 2107
2106 for (; num_rsp; num_rsp--) { 2108 for (; num_rsp; num_rsp--) {
2107 bacpy(&data.bdaddr, &info->bdaddr); 2109 bacpy(&data.bdaddr, &info->bdaddr);
@@ -2261,12 +2263,12 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, struct
2261 2263
2262 for (; num_rsp; num_rsp--) { 2264 for (; num_rsp; num_rsp--) {
2263 bacpy(&data.bdaddr, &info->bdaddr); 2265 bacpy(&data.bdaddr, &info->bdaddr);
2264 data.pscan_rep_mode = info->pscan_rep_mode; 2266 data.pscan_rep_mode = info->pscan_rep_mode;
2265 data.pscan_period_mode = info->pscan_period_mode; 2267 data.pscan_period_mode = info->pscan_period_mode;
2266 data.pscan_mode = 0x00; 2268 data.pscan_mode = 0x00;
2267 memcpy(data.dev_class, info->dev_class, 3); 2269 memcpy(data.dev_class, info->dev_class, 3);
2268 data.clock_offset = info->clock_offset; 2270 data.clock_offset = info->clock_offset;
2269 data.rssi = info->rssi; 2271 data.rssi = info->rssi;
2270 data.ssp_mode = 0x01; 2272 data.ssp_mode = 0x01;
2271 info++; 2273 info++;
2272 hci_inquiry_cache_update(hdev, &data); 2274 hci_inquiry_cache_update(hdev, &data);