Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

[NET] BLUETOOTH: Fix whitespace errors.

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

YOSHIFUJI Hideaki and committed by
David S. Miller
8e87d142 528930b9

+270 -270
+8 -8
net/bluetooth/af_bluetooth.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 119 119 120 120 read_unlock(&bt_proto_lock); 121 121 122 - return err; 122 + return err; 123 123 } 124 124 125 125 void bt_sock_link(struct bt_sock_list *l, struct sock *sk) ··· 265 265 if (sk->sk_shutdown == SHUTDOWN_MASK) 266 266 mask |= POLLHUP; 267 267 268 - if (!skb_queue_empty(&sk->sk_receive_queue) || 268 + if (!skb_queue_empty(&sk->sk_receive_queue) || 269 269 (sk->sk_shutdown & RCV_SHUTDOWN)) 270 270 mask |= POLLIN | POLLRDNORM; 271 271
+9 -9
net/bluetooth/bnep/bnep.h
··· 1 1 /* 2 2 BNEP protocol definition for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 4 - 4 + 5 5 This program is free software; you can redistribute it and/or modify 6 6 it under the terms of the GNU General Public License, version 2, as 7 7 published by the Free Software Foundation. ··· 60 60 // Extension types 61 61 #define BNEP_EXT_CONTROL 0x00 62 62 63 - // Response messages 63 + // Response messages 64 64 #define BNEP_SUCCESS 0x00 65 65 66 66 #define BNEP_CONN_INVALID_DST 0x01 ··· 81 81 #define BNEP_CONNECT_TO 15 82 82 #define BNEP_FILTER_TO 15 83 83 84 - // Headers 84 + // Headers 85 85 #define BNEP_TYPE_MASK 0x7f 86 86 #define BNEP_EXT_HEADER 0x80 87 87 ··· 132 132 struct bnep_conninfo { 133 133 __u32 flags; 134 134 __u16 role; 135 - __u16 state; 135 + __u16 state; 136 136 __u8 dst[ETH_ALEN]; 137 137 char device[16]; 138 138 }; ··· 155 155 // BNEP sessions 156 156 struct bnep_session { 157 157 struct list_head list; 158 - 158 + 159 159 unsigned int role; 160 - unsigned long state; 161 - unsigned long flags; 160 + unsigned long state; 161 + unsigned long flags; 162 162 atomic_t killed; 163 163 164 164 struct ethhdr eh; ··· 166 166 167 167 struct bnep_proto_filter proto_filter[BNEP_MAX_PROTO_FILTERS]; 168 168 u64 mc_filter; 169 - 169 + 170 170 struct socket *sock; 171 171 struct net_device *dev; 172 172 struct net_device_stats stats; ··· 178 178 179 179 static inline int bnep_mc_hash(__u8 *addr) 180 180 { 181 - return (crc32_be(~0, addr, ETH_ALEN) >> 26); 181 + return (crc32_be(~0, addr, ETH_ALEN) >> 26); 182 182 } 183 183 184 184 #endif
+26 -26
net/bluetooth/bnep/core.c
··· 1 - /* 1 + /* 2 2 BNEP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2001-2002 Inventel Systemes 4 4 Written 2001-2002 by ··· 15 15 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 17 17 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 18 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 19 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 20 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 19 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 20 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 21 21 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 22 22 23 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 24 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 23 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 24 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 25 25 SOFTWARE IS DISCLAIMED. 26 26 */ 27 27 28 28 /* 29 29 * $Id: core.c,v 1.20 2002/08/04 21:23:58 maxk Exp $ 30 - */ 30 + */ 31 31 32 32 #include <linux/module.h> 33 33 ··· 74 74 BT_DBG(""); 75 75 76 76 list_for_each(p, &bnep_session_list) { 77 - s = list_entry(p, struct bnep_session, list); 77 + s = list_entry(p, struct bnep_session, list); 78 78 if (!compare_ether_addr(dst, s->eh.h_source)) 79 79 return s; 80 80 } ··· 87 87 by the socket layer which has to hold the refference to this module. 88 88 */ 89 89 __module_get(THIS_MODULE); 90 - list_add(&s->list, &bnep_session_list); 90 + list_add(&s->list, &bnep_session_list); 91 91 } 92 92 93 93 static void __bnep_unlink_session(struct bnep_session *s) ··· 203 203 204 204 memcpy(a1, data, ETH_ALEN); data += ETH_ALEN; 205 205 a2 = data; data += ETH_ALEN; 206 - 206 + 207 207 BT_DBG("mc filter %s -> %s", 208 208 batostr((void *) a1), batostr((void *) a2)); 209 209 ··· 277 277 } 278 278 279 279 BT_DBG("type 0x%x len %d", h->type, h->len); 280 - 280 + 281 281 switch (h->type & BNEP_TYPE_MASK) { 282 282 case BNEP_EXT_CONTROL: 283 283 bnep_rx_control(s, skb->data, skb->len); ··· 293 293 break; 294 294 } 295 295 } while (!err && (h->type & BNEP_EXT_HEADER)); 296 - 296 + 297 297 return err; 298 298 } 299 299 ··· 319 319 320 320 if ((type & BNEP_TYPE_MASK) > BNEP_RX_TYPES) 321 321 goto badframe; 322 - 322 + 323 323 if ((type & BNEP_TYPE_MASK) == BNEP_CONTROL) { 324 324 bnep_rx_control(s, skb->data, skb->len); 325 325 kfree_skb(skb); ··· 345 345 goto badframe; 346 346 s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2)); 347 347 } 348 - 348 + 349 349 /* We have to alloc new skb and copy data here :(. Because original skb 350 350 * may not be modified and because of the alignment requirements. */ 351 351 nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL); ··· 361 361 case BNEP_COMPRESSED: 362 362 memcpy(__skb_put(nskb, ETH_HLEN), &s->eh, ETH_HLEN); 363 363 break; 364 - 364 + 365 365 case BNEP_COMPRESSED_SRC_ONLY: 366 366 memcpy(__skb_put(nskb, ETH_ALEN), s->eh.h_dest, ETH_ALEN); 367 367 memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN); ··· 381 381 382 382 memcpy(__skb_put(nskb, skb->len), skb->data, skb->len); 383 383 kfree_skb(skb); 384 - 384 + 385 385 s->stats.rx_packets++; 386 386 nskb->dev = dev; 387 387 nskb->ip_summed = CHECKSUM_NONE; ··· 435 435 iv[il++] = (struct kvec) { eh->h_source, ETH_ALEN }; 436 436 len += ETH_ALEN; 437 437 break; 438 - 438 + 439 439 case BNEP_COMPRESSED_DST_ONLY: 440 440 iv[il++] = (struct kvec) { eh->h_dest, ETH_ALEN }; 441 441 len += ETH_ALEN; ··· 445 445 send: 446 446 iv[il++] = (struct kvec) { skb->data, skb->len }; 447 447 len += skb->len; 448 - 448 + 449 449 /* FIXME: linearize skb */ 450 450 { 451 451 len = kernel_sendmsg(sock, &s->msg, iv, il, len); ··· 471 471 472 472 BT_DBG(""); 473 473 474 - daemonize("kbnepd %s", dev->name); 474 + daemonize("kbnepd %s", dev->name); 475 475 set_user_nice(current, -15); 476 476 current->flags |= PF_NOFREEZE; 477 477 ··· 488 488 489 489 if (sk->sk_state != BT_CONNECTED) 490 490 break; 491 - 491 + 492 492 // TX 493 493 while ((skb = skb_dequeue(&sk->sk_write_queue))) 494 494 if (bnep_tx_frame(s, skb)) 495 495 break; 496 496 netif_wake_queue(dev); 497 - 497 + 498 498 schedule(); 499 499 } 500 500 set_current_state(TASK_RUNNING); ··· 573 573 s->sock = sock; 574 574 s->role = req->role; 575 575 s->state = BT_CONNECTED; 576 - 576 + 577 577 s->msg.msg_flags = MSG_NOSIGNAL; 578 578 579 579 #ifdef CONFIG_BT_BNEP_MC_FILTER ··· 594 594 } 595 595 596 596 __bnep_link_session(s); 597 - 597 + 598 598 err = kernel_thread(bnep_session, s, CLONE_KERNEL); 599 599 if (err < 0) { 600 600 /* Session thread start failed, gotta cleanup. */ ··· 627 627 /* Wakeup user-space which is polling for socket errors. 628 628 * This is temporary hack untill we have shutdown in L2CAP */ 629 629 s->sock->sk->sk_err = EUNATCH; 630 - 630 + 631 631 /* Kill session thread */ 632 632 atomic_inc(&s->killed); 633 633 wake_up_interruptible(s->sock->sk->sk_sleep); ··· 661 661 s = list_entry(p, struct bnep_session, list); 662 662 663 663 __bnep_copy_ci(&ci, s); 664 - 664 + 665 665 if (copy_to_user(req->ci, &ci, sizeof(ci))) { 666 666 err = -EFAULT; 667 667 break; ··· 696 696 } 697 697 698 698 static int __init bnep_init(void) 699 - { 699 + { 700 700 char flt[50] = ""; 701 701 702 702 l2cap_load();
+17 -17
net/bluetooth/bnep/netdev.c
··· 1 - /* 1 + /* 2 2 BNEP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2001-2002 Inventel Systemes 4 4 Written 2001-2002 by ··· 15 15 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 16 16 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 17 17 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 18 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 19 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 20 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 19 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 20 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 21 21 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 22 22 23 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 24 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 23 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 24 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 25 25 SOFTWARE IS DISCLAIMED. 26 26 */ 27 27 28 28 /* 29 29 * $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $ 30 - */ 30 + */ 31 31 32 32 #include <linux/module.h> 33 33 ··· 94 94 r->type = BNEP_CONTROL; 95 95 r->ctrl = BNEP_FILTER_MULTI_ADDR_SET; 96 96 97 - if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { 97 + if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) { 98 98 u8 start[ETH_ALEN] = { 0x01 }; 99 99 100 100 /* Request all addresses */ ··· 102 102 memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); 103 103 r->len = htons(ETH_ALEN * 2); 104 104 } else { 105 - struct dev_mc_list *dmi = dev->mc_list; 105 + struct dev_mc_list *dmi = dev->mc_list; 106 106 int i, len = skb->len; 107 107 108 108 if (dev->flags & IFF_BROADCAST) { 109 109 memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); 110 110 memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN); 111 - } 112 - 111 + } 112 + 113 113 /* FIXME: We should group addresses here. */ 114 114 115 115 for (i = 0; i < dev->mc_count && i < BNEP_MAX_MULTICAST_FILTERS; i++) { ··· 159 159 { 160 160 struct ethhdr *eh = (void *) skb->data; 161 161 u16 proto = ntohs(eh->h_proto); 162 - 162 + 163 163 if (proto >= 1536) 164 164 return proto; 165 - 165 + 166 166 if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF)) 167 167 return ETH_P_802_3; 168 - 168 + 169 169 return ETH_P_802_2; 170 170 } 171 171 ··· 174 174 u16 proto = bnep_net_eth_proto(skb); 175 175 struct bnep_proto_filter *f = s->proto_filter; 176 176 int i; 177 - 177 + 178 178 for (i = 0; i < BNEP_MAX_PROTO_FILTERS && f[i].end; i++) { 179 179 if (proto >= f[i].start && proto <= f[i].end) 180 180 return 0; ··· 198 198 return 0; 199 199 } 200 200 #endif 201 - 201 + 202 202 #ifdef CONFIG_BT_BNEP_PROTO_FILTER 203 203 if (bnep_net_proto_filter(skb, s)) { 204 204 kfree_skb(skb); 205 205 return 0; 206 206 } 207 207 #endif 208 - 208 + 209 209 /* 210 210 * We cannot send L2CAP packets from here as we are potentially in a bh. 211 211 * So we have to queue them and wake up session thread which is sleeping
+13 -13
net/bluetooth/bnep/sock.c
··· 1 - /* 1 + /* 2 2 BNEP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2001-2002 Inventel Systemes 4 4 Written 2001-2002 by ··· 14 14 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 15 15 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 16 16 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 17 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 18 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 19 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 18 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 19 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 20 20 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 21 21 22 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 23 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 23 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 24 24 SOFTWARE IS DISCLAIMED. 25 25 */ 26 26 27 27 /* 28 28 * $Id: sock.c,v 1.4 2002/08/04 21:23:58 maxk Exp $ 29 - */ 29 + */ 30 30 31 31 #include <linux/module.h> 32 32 ··· 89 89 90 90 if (copy_from_user(&ca, argp, sizeof(ca))) 91 91 return -EFAULT; 92 - 92 + 93 93 nsock = sockfd_lookup(ca.sock, &err); 94 94 if (!nsock) 95 95 return err; ··· 101 101 102 102 err = bnep_add_connection(&ca, nsock); 103 103 if (!err) { 104 - if (copy_to_user(argp, &ca, sizeof(ca))) 104 + if (copy_to_user(argp, &ca, sizeof(ca))) 105 105 err = -EFAULT; 106 106 } else 107 107 fput(nsock->file); 108 108 109 109 return err; 110 - 110 + 111 111 case BNEPCONNDEL: 112 112 if (!capable(CAP_NET_ADMIN)) 113 113 return -EACCES; 114 114 115 115 if (copy_from_user(&cd, argp, sizeof(cd))) 116 116 return -EFAULT; 117 - 117 + 118 118 return bnep_del_connection(&cd); 119 119 120 120 case BNEPGETCONNLIST: ··· 123 123 124 124 if (cl.cnum <= 0) 125 125 return -EINVAL; 126 - 126 + 127 127 err = bnep_get_connlist(&cl); 128 128 if (!err && copy_to_user(argp, &cl, sizeof(cl))) 129 129 return -EFAULT; ··· 163 163 164 164 if (cl.cnum <= 0) 165 165 return -EINVAL; 166 - 166 + 167 167 err = bnep_get_connlist(&cl); 168 168 169 169 if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
+7 -7
net/bluetooth/cmtp/capi.c
··· 1 - /* 1 + /* 2 2 CMTP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002-2003 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22 ··· 563 563 564 564 ret = wait_event_interruptible_timeout(session->wait, 565 565 session->ncontroller, CMTP_INTEROP_TIMEOUT); 566 - 566 + 567 567 BT_INFO("Found %d CAPI controller(s) on device %s", session->ncontroller, session->name); 568 568 569 569 if (!ret)
+6 -6
net/bluetooth/cmtp/cmtp.h
··· 1 - /* 1 + /* 2 2 CMTP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002-2003 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22
+7 -7
net/bluetooth/cmtp/core.c
··· 1 - /* 1 + /* 2 2 CMTP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002-2003 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22 ··· 336 336 baswap(&dst, &bt_sk(sock->sk)->dst); 337 337 338 338 session = kzalloc(sizeof(struct cmtp_session), GFP_KERNEL); 339 - if (!session) 339 + if (!session) 340 340 return -ENOMEM; 341 341 342 342 down_write(&cmtp_session_sem);
+7 -7
net/bluetooth/cmtp/sock.c
··· 1 - /* 1 + /* 2 2 CMTP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002-2003 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22 ··· 154 154 155 155 if (cl.cnum <= 0) 156 156 return -EINVAL; 157 - 157 + 158 158 err = cmtp_get_connlist(&cl); 159 159 160 160 if (!err && put_user(cl.cnum, (uint32_t __user *) arg))
+10 -10
net/bluetooth/hci_conn.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 146 146 case BT_CONNECT: 147 147 hci_acl_connect_cancel(conn); 148 148 break; 149 - case BT_CONNECTED: 149 + case BT_CONNECTED: 150 150 hci_acl_disconn(conn, 0x13); 151 151 break; 152 152 default: ··· 272 272 if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags)) 273 273 continue; 274 274 275 - /* Simple routing: 275 + /* Simple routing: 276 276 * No source address - find interface with bdaddr != dst 277 277 * Source address - find interface with bdaddr == src 278 278 */ ··· 328 328 329 329 hci_conn_hold(sco); 330 330 331 - if (acl->state == BT_CONNECTED && 331 + if (acl->state == BT_CONNECTED && 332 332 (sco->state == BT_OPEN || sco->state == BT_CLOSED)) 333 333 hci_add_sco(sco, acl->handle); 334 334 ··· 370 370 if (hci_conn_auth(conn)) { 371 371 struct hci_cp_set_conn_encrypt cp; 372 372 cp.handle = __cpu_to_le16(conn->handle); 373 - cp.encrypt = 1; 373 + cp.encrypt = 1; 374 374 hci_send_cmd(conn->hdev, OGF_LINK_CTL, OCF_SET_CONN_ENCRYPT, sizeof(cp), &cp); 375 375 } 376 376 return 0;
+18 -18
net/bluetooth/hci_core.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 116 116 } 117 117 118 118 /* Execute request and wait for completion. */ 119 - static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), 119 + static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), 120 120 unsigned long opt, __u32 timeout) 121 121 { 122 122 DECLARE_WAITQUEUE(wait, current); ··· 278 278 hci_send_cmd(hdev, OGF_HOST_CTL, OCF_WRITE_ENCRYPT_MODE, 1, &encrypt); 279 279 } 280 280 281 - /* Get HCI device by index. 281 + /* Get HCI device by index. 282 282 * Device is held on return. */ 283 283 struct hci_dev *hci_dev_get(int index) 284 284 { ··· 405 405 return -ENODEV; 406 406 407 407 hci_dev_lock_bh(hdev); 408 - if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX || 408 + if (inquiry_cache_age(hdev) > INQUIRY_CACHE_AGE_MAX || 409 409 inquiry_cache_empty(hdev) || 410 410 ir.flags & IREQ_CACHE_FLUSH) { 411 411 inquiry_cache_flush(hdev); ··· 439 439 if (copy_to_user(ptr, buf, sizeof(struct inquiry_info) * 440 440 ir.num_rsp)) 441 441 err = -EFAULT; 442 - } else 442 + } else 443 443 err = -EFAULT; 444 444 445 445 kfree(buf); ··· 491 491 hci_dev_hold(hdev); 492 492 set_bit(HCI_UP, &hdev->flags); 493 493 hci_notify(hdev, HCI_DEV_UP); 494 - } else { 494 + } else { 495 495 /* Init failed, cleanup */ 496 496 tasklet_kill(&hdev->rx_task); 497 497 tasklet_kill(&hdev->tx_task); ··· 619 619 if (hdev->flush) 620 620 hdev->flush(hdev); 621 621 622 - atomic_set(&hdev->cmd_cnt, 1); 622 + atomic_set(&hdev->cmd_cnt, 1); 623 623 hdev->acl_cnt = 0; hdev->sco_cnt = 0; 624 624 625 625 if (!test_bit(HCI_RAW, &hdev->flags)) ··· 841 841 break; 842 842 head = p; id++; 843 843 } 844 - 844 + 845 845 sprintf(hdev->name, "hci%d", id); 846 846 hdev->id = id; 847 847 list_add(&hdev->list, head); ··· 1109 1109 __skb_queue_tail(&conn->data_q, skb); 1110 1110 do { 1111 1111 skb = list; list = list->next; 1112 - 1112 + 1113 1113 skb->dev = (void *) hdev; 1114 1114 bt_cb(skb)->pkt_type = HCI_ACLDATA_PKT; 1115 1115 hci_add_acl_hdr(skb, conn->handle, flags | ACL_CONT); ··· 1164 1164 int num = 0, min = ~0; 1165 1165 struct list_head *p; 1166 1166 1167 - /* We don't have to lock device here. Connections are always 1167 + /* We don't have to lock device here. Connections are always 1168 1168 * added and removed with TX task disabled. */ 1169 1169 list_for_each(p, &h->list) { 1170 1170 struct hci_conn *c; ··· 1306 1306 hci_dev_lock(hdev); 1307 1307 conn = hci_conn_hash_lookup_handle(hdev, handle); 1308 1308 hci_dev_unlock(hdev); 1309 - 1309 + 1310 1310 if (conn) { 1311 1311 register struct hci_proto *hp; 1312 1312 ··· 1318 1318 return; 1319 1319 } 1320 1320 } else { 1321 - BT_ERR("%s ACL packet for unknown connection handle %d", 1321 + BT_ERR("%s ACL packet for unknown connection handle %d", 1322 1322 hdev->name, handle); 1323 1323 } 1324 1324 ··· 1353 1353 return; 1354 1354 } 1355 1355 } else { 1356 - BT_ERR("%s SCO packet for unknown connection handle %d", 1356 + BT_ERR("%s SCO packet for unknown connection handle %d", 1357 1357 hdev->name, handle); 1358 1358 } 1359 1359
+13 -13
net/bluetooth/hci_event.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 100 100 BT_DBG("%s ocf 0x%x", hdev->name, ocf); 101 101 102 102 switch (ocf) { 103 - case OCF_ROLE_DISCOVERY: 103 + case OCF_ROLE_DISCOVERY: 104 104 rd = (void *) skb->data; 105 105 106 106 if (rd->status) ··· 141 141 break; 142 142 143 143 default: 144 - BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x", 144 + BT_DBG("%s: Command complete: ogf LINK_POLICY ocf %x", 145 145 hdev->name, ocf); 146 146 break; 147 147 } ··· 237 237 if (!status) { 238 238 clear_bit(HCI_PSCAN, &hdev->flags); 239 239 clear_bit(HCI_ISCAN, &hdev->flags); 240 - if (param & SCAN_INQUIRY) 240 + if (param & SCAN_INQUIRY) 241 241 set_bit(HCI_ISCAN, &hdev->flags); 242 242 243 - if (param & SCAN_PAGE) 243 + if (param & SCAN_PAGE) 244 244 set_bit(HCI_PSCAN, &hdev->flags); 245 245 } 246 246 hci_req_complete(hdev, status); ··· 343 343 344 344 memcpy(hdev->features, lf->features, sizeof(hdev->features)); 345 345 346 - /* Adjust default settings according to features 346 + /* Adjust default settings according to features 347 347 * supported by device. */ 348 348 if (hdev->features[0] & LMP_3SLOT) 349 349 hdev->pkt_type |= (HCI_DM3 | HCI_DH3); ··· 491 491 break; 492 492 493 493 default: 494 - BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d", 494 + BT_DBG("%s Command status: ogf LINK_CTL ocf %x status %d", 495 495 hdev->name, ocf, status); 496 496 break; 497 497 } ··· 793 793 if (!conn->out) { 794 794 struct hci_cp_change_conn_ptype cp; 795 795 cp.handle = ev->handle; 796 - cp.pkt_type = (conn->type == ACL_LINK) ? 796 + cp.pkt_type = (conn->type == ACL_LINK) ? 797 797 __cpu_to_le16(hdev->pkt_type & ACL_PTYPE_MASK): 798 798 __cpu_to_le16(hdev->pkt_type & SCO_PTYPE_MASK); 799 799
+14 -14
net/bluetooth/hci_sock.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 170 170 return 0; 171 171 } 172 172 173 - /* Ioctls that require bound socket */ 173 + /* Ioctls that require bound socket */ 174 174 static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsigned long arg) 175 175 { 176 176 struct hci_dev *hdev = hci_pi(sk)->hdev; ··· 348 348 put_cmsg(msg, SOL_HCI, HCI_CMSG_TSTAMP, sizeof(tv), &tv); 349 349 } 350 350 } 351 - 352 - static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 351 + 352 + static int hci_sock_recvmsg(struct kiocb *iocb, struct socket *sock, 353 353 struct msghdr *msg, size_t len, int flags) 354 354 { 355 355 int noblock = flags & MSG_DONTWAIT; ··· 386 386 return err ? : copied; 387 387 } 388 388 389 - static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 389 + static int hci_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 390 390 struct msghdr *msg, size_t len) 391 391 { 392 392 struct sock *sk = sock->sk; ··· 520 520 *((u32 *) f->event_mask + 0) = uf.event_mask[0]; 521 521 *((u32 *) f->event_mask + 1) = uf.event_mask[1]; 522 522 } 523 - break; 523 + break; 524 524 525 525 default: 526 526 err = -ENOPROTOOPT; ··· 535 535 { 536 536 struct hci_ufilter uf; 537 537 struct sock *sk = sock->sk; 538 - int len, opt; 538 + int len, opt; 539 539 540 540 if (get_user(len, optlen)) 541 541 return -EFAULT; ··· 544 544 case HCI_DATA_DIR: 545 545 if (hci_pi(sk)->cmsg_mask & HCI_CMSG_DIR) 546 546 opt = 1; 547 - else 547 + else 548 548 opt = 0; 549 549 550 550 if (put_user(opt, optval)) ··· 554 554 case HCI_TIME_STAMP: 555 555 if (hci_pi(sk)->cmsg_mask & HCI_CMSG_TSTAMP) 556 556 opt = 1; 557 - else 557 + else 558 558 opt = 0; 559 559 560 560 if (put_user(opt, optval))
+7 -7
net/bluetooth/hidp/core.c
··· 1 - /* 1 + /* 2 2 HIDP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22 ··· 293 293 294 294 case HIDP_HSHK_ERR_FATAL: 295 295 /* Device requests a reboot, as this is the only way this error 296 - * can be recovered. */ 296 + * can be recovered. */ 297 297 __hidp_send_ctrl_message(session, 298 298 HIDP_TRANS_HID_CONTROL | HIDP_CTRL_SOFT_RESET, NULL, 0); 299 299 break;
+6 -6
net/bluetooth/hidp/hidp.h
··· 1 - /* 1 + /* 2 2 HIDP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22
+7 -7
net/bluetooth/hidp/sock.c
··· 1 - /* 1 + /* 2 2 HIDP implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2003-2004 Marcel Holtmann <marcel@holtmann.org> 4 4 ··· 10 10 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 11 11 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 12 12 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 13 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 13 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 14 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 15 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 16 16 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 17 17 18 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 18 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 19 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 20 SOFTWARE IS DISCLAIMED. 21 21 */ 22 22 ··· 206 206 put_user(ca.idle_to, &uca->idle_to) || 207 207 copy_to_user(&uca->name[0], &ca.name[0], 128)) 208 208 return -EFAULT; 209 - 209 + 210 210 arg = (unsigned long) uca; 211 211 212 212 /* Fall through. We don't actually write back any _changes_
+13 -13
net/bluetooth/l2cap.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 227 227 bt_accept_enqueue(parent, sk); 228 228 } 229 229 230 - /* Delete channel. 230 + /* Delete channel. 231 231 * Must be called on the locked socket. */ 232 232 static void l2cap_chan_del(struct sock *sk, int err) 233 233 { ··· 238 238 239 239 BT_DBG("sk %p, conn %p, err %d", sk, conn, err); 240 240 241 - if (conn) { 241 + if (conn) { 242 242 /* Unlink from channel list */ 243 243 l2cap_chan_unlink(&conn->chan_list, sk); 244 244 l2cap_pi(sk)->conn = NULL; ··· 590 590 err = -EACCES; 591 591 goto done; 592 592 } 593 - 593 + 594 594 write_lock_bh(&l2cap_sk_list.lock); 595 595 596 596 if (la->l2_psm && __l2cap_get_sock_by_addr(la->l2_psm, &la->l2_bdaddr)) { ··· 890 890 *frag = bt_skb_send_alloc(sk, count, msg->msg_flags & MSG_DONTWAIT, &err); 891 891 if (!*frag) 892 892 goto fail; 893 - 893 + 894 894 if (memcpy_fromiovec(skb_put(*frag, count), msg->msg_iov, count)) { 895 895 err = -EFAULT; 896 896 goto fail; ··· 1267 1267 1268 1268 static inline void l2cap_parse_conf_req(struct sock *sk, void *data, int len) 1269 1269 { 1270 - int type, hint, olen; 1270 + int type, hint, olen; 1271 1271 unsigned long val; 1272 1272 void *ptr = data; 1273 1273 ··· 1414 1414 1415 1415 /* Check for backlog size */ 1416 1416 if (sk_acceptq_is_full(parent)) { 1417 - BT_DBG("backlog full %d", parent->sk_ack_backlog); 1417 + BT_DBG("backlog full %d", parent->sk_ack_backlog); 1418 1418 goto response; 1419 1419 } 1420 1420 ··· 1607 1607 goto done; 1608 1608 } 1609 1609 1610 - default: 1610 + default: 1611 1611 sk->sk_state = BT_DISCONN; 1612 1612 sk->sk_err = ECONNRESET; 1613 1613 l2cap_sock_set_timer(sk, HZ * 5);
+6 -6
net/bluetooth/lib.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24
+28 -28
net/bluetooth/rfcomm/core.c
··· 1 - /* 1 + /* 2 2 RFCOMM implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 4 4 Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org> ··· 11 11 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12 12 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 13 13 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 14 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 17 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 18 19 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 19 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 21 21 SOFTWARE IS DISCLAIMED. 22 22 */ 23 23 ··· 134 134 /* ---- RFCOMM FCS computation ---- */ 135 135 136 136 /* reversed, 8-bit, poly=0x07 */ 137 - static unsigned char rfcomm_crc_table[256] = { 137 + static unsigned char rfcomm_crc_table[256] = { 138 138 0x00, 0x91, 0xe3, 0x72, 0x07, 0x96, 0xe4, 0x75, 139 139 0x0e, 0x9f, 0xed, 0x7c, 0x09, 0x98, 0xea, 0x7b, 140 140 0x1c, 0x8d, 0xff, 0x6e, 0x1b, 0x8a, 0xf8, 0x69, ··· 179 179 /* CRC on 2 bytes */ 180 180 #define __crc(data) (rfcomm_crc_table[rfcomm_crc_table[0xff ^ data[0]] ^ data[1]]) 181 181 182 - /* FCS on 2 bytes */ 182 + /* FCS on 2 bytes */ 183 183 static inline u8 __fcs(u8 *data) 184 184 { 185 185 return (0xff - __crc(data)); 186 186 } 187 187 188 - /* FCS on 3 bytes */ 188 + /* FCS on 3 bytes */ 189 189 static inline u8 __fcs2(u8 *data) 190 190 { 191 191 return (0xff - rfcomm_crc_table[__crc(data) ^ data[2]]); ··· 288 288 atomic_set(&d->refcnt, 1); 289 289 290 290 rfcomm_dlc_clear_state(d); 291 - 291 + 292 292 BT_DBG("%p", d); 293 293 294 294 return d; ··· 345 345 int err = 0; 346 346 u8 dlci; 347 347 348 - BT_DBG("dlc %p state %ld %s %s channel %d", 348 + BT_DBG("dlc %p state %ld %s %s channel %d", 349 349 d, d->state, batostr(src), batostr(dst), channel); 350 350 351 351 if (channel < 1 || channel > 30) ··· 489 489 rfcomm_schedule(RFCOMM_SCHED_TX); 490 490 } 491 491 492 - /* 492 + /* 493 493 Set/get modem status functions use _local_ status i.e. what we report 494 494 to the other side. 495 495 Remote status is provided by dlc->modem_status() callback. 496 496 */ 497 497 int rfcomm_dlc_set_modem_status(struct rfcomm_dlc *d, u8 v24_sig) 498 498 { 499 - BT_DBG("dlc %p state %ld v24_sig 0x%x", 499 + BT_DBG("dlc %p state %ld v24_sig 0x%x", 500 500 d, d->state, v24_sig); 501 501 502 502 if (test_bit(RFCOMM_RX_THROTTLED, &d->flags)) 503 503 v24_sig |= RFCOMM_V24_FC; 504 504 else 505 505 v24_sig &= ~RFCOMM_V24_FC; 506 - 506 + 507 507 d->v24_sig = v24_sig; 508 508 509 509 if (!test_and_set_bit(RFCOMM_MSC_PENDING, &d->flags)) ··· 514 514 515 515 int rfcomm_dlc_get_modem_status(struct rfcomm_dlc *d, u8 *v24_sig) 516 516 { 517 - BT_DBG("dlc %p state %ld v24_sig 0x%x", 517 + BT_DBG("dlc %p state %ld v24_sig 0x%x", 518 518 d, d->state, d->v24_sig); 519 519 520 520 *v24_sig = d->v24_sig; ··· 576 576 struct bt_sock *sk; 577 577 list_for_each_safe(p, n, &session_list) { 578 578 s = list_entry(p, struct rfcomm_session, list); 579 - sk = bt_sk(s->sock->sk); 579 + sk = bt_sk(s->sock->sk); 580 580 581 581 if ((!bacmp(src, BDADDR_ANY) || !bacmp(&sk->src, src)) && 582 582 !bacmp(&sk->dst, dst)) ··· 825 825 826 826 int rfcomm_send_rpn(struct rfcomm_session *s, int cr, u8 dlci, 827 827 u8 bit_rate, u8 data_bits, u8 stop_bits, 828 - u8 parity, u8 flow_ctrl_settings, 828 + u8 parity, u8 flow_ctrl_settings, 829 829 u8 xon_char, u8 xoff_char, u16 param_mask) 830 830 { 831 831 struct rfcomm_hdr *hdr; ··· 834 834 u8 buf[16], *ptr = buf; 835 835 836 836 BT_DBG("%p cr %d dlci %d bit_r 0x%x data_b 0x%x stop_b 0x%x parity 0x%x" 837 - " flwc_s 0x%x xon_c 0x%x xoff_c 0x%x p_mask 0x%x", 838 - s, cr, dlci, bit_rate, data_bits, stop_bits, parity, 837 + " flwc_s 0x%x xon_c 0x%x xoff_c 0x%x p_mask 0x%x", 838 + s, cr, dlci, bit_rate, data_bits, stop_bits, parity, 839 839 flow_ctrl_settings, xon_char, xoff_char, param_mask); 840 840 841 841 hdr = (void *) ptr; ptr += sizeof(*hdr); ··· 1120 1120 1121 1121 d->state = BT_CLOSED; 1122 1122 __rfcomm_dlc_close(d, err); 1123 - } else 1123 + } else 1124 1124 rfcomm_send_dm(s, dlci); 1125 - 1125 + 1126 1126 } else { 1127 1127 rfcomm_send_ua(s, 0); 1128 1128 ··· 1230 1230 { 1231 1231 struct rfcomm_session *s = d->session; 1232 1232 1233 - BT_DBG("dlc %p state %ld dlci %d mtu %d fc 0x%x credits %d", 1233 + BT_DBG("dlc %p state %ld dlci %d mtu %d fc 0x%x credits %d", 1234 1234 d, d->state, d->dlci, pn->mtu, pn->flow_ctrl, pn->credits); 1235 1235 1236 1236 if ((pn->flow_ctrl == 0xf0 && s->cfc != RFCOMM_CFC_DISABLED) || ··· 1454 1454 if (d->modem_status) 1455 1455 d->modem_status(d, msc->v24_sig); 1456 1456 rfcomm_dlc_unlock(d); 1457 - 1457 + 1458 1458 rfcomm_send_msc(s, 0, dlci, msc->v24_sig); 1459 1459 1460 1460 d->mscex |= RFCOMM_MSCEX_RX; ··· 1641 1641 struct sk_buff *skb; 1642 1642 int err; 1643 1643 1644 - BT_DBG("dlc %p state %ld cfc %d rx_credits %d tx_credits %d", 1644 + BT_DBG("dlc %p state %ld cfc %d rx_credits %d tx_credits %d", 1645 1645 d, d->state, d->cfc, d->rx_credits, d->tx_credits); 1646 1646 1647 1647 /* Send pending MSC */ 1648 1648 if (test_and_clear_bit(RFCOMM_MSC_PENDING, &d->flags)) 1649 - rfcomm_send_msc(d->session, 1, d->dlci, d->v24_sig); 1649 + rfcomm_send_msc(d->session, 1, d->dlci, d->v24_sig); 1650 1650 1651 1651 if (d->cfc) { 1652 - /* CFC enabled. 1652 + /* CFC enabled. 1653 1653 * Give them some credits */ 1654 1654 if (!test_bit(RFCOMM_RX_THROTTLED, &d->flags) && 1655 - d->rx_credits <= (d->cfc >> 2)) { 1655 + d->rx_credits <= (d->cfc >> 2)) { 1656 1656 rfcomm_send_credits(d->session, d->addr, d->cfc - d->rx_credits); 1657 1657 d->rx_credits = d->cfc; 1658 1658 } ··· 1876 1876 1877 1877 /* Create socket */ 1878 1878 err = rfcomm_l2sock_create(&sock); 1879 - if (err < 0) { 1879 + if (err < 0) { 1880 1880 BT_ERR("Create socket failed %d", err); 1881 1881 return err; 1882 1882 }
+10 -10
net/bluetooth/rfcomm/sock.c
··· 1 - /* 1 + /* 2 2 RFCOMM implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 4 4 Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org> ··· 11 11 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12 12 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 13 13 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 14 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 17 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 18 19 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 19 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 21 21 SOFTWARE IS DISCLAIMED. 22 22 */ 23 23 ··· 130 130 struct hlist_node *node; 131 131 132 132 sk_for_each(sk, node, &rfcomm_sk_list.head) { 133 - if (rfcomm_pi(sk)->channel == channel && 133 + if (rfcomm_pi(sk)->channel == channel && 134 134 !bacmp(&bt_sk(sk)->src, src)) 135 135 break; 136 136 } ··· 572 572 while (len) { 573 573 size_t size = min_t(size_t, len, d->mtu); 574 574 int err; 575 - 575 + 576 576 skb = sock_alloc_send_skb(sk, size + RFCOMM_SKB_RESERVE, 577 577 msg->msg_flags & MSG_DONTWAIT, &err); 578 578 if (!skb) ··· 843 843 return err; 844 844 } 845 845 846 - /* ---- RFCOMM core layer callbacks ---- 846 + /* ---- RFCOMM core layer callbacks ---- 847 847 * 848 848 * called under rfcomm_lock() 849 849 */ ··· 864 864 865 865 /* Check for backlog size */ 866 866 if (sk_acceptq_is_full(parent)) { 867 - BT_DBG("backlog full %d", parent->sk_ack_backlog); 867 + BT_DBG("backlog full %d", parent->sk_ack_backlog); 868 868 goto done; 869 869 } 870 870
+23 -23
net/bluetooth/rfcomm/tty.c
··· 1 - /* 1 + /* 2 2 RFCOMM implementation for Linux Bluetooth stack (BlueZ). 3 3 Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com> 4 4 Copyright (C) 2002 Marcel Holtmann <marcel@holtmann.org> ··· 11 11 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 12 12 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 13 13 IN NO EVENT SHALL THE COPYRIGHT HOLDER(S) AND AUTHOR(S) BE LIABLE FOR ANY 14 - CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 14 + CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES 15 + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN 16 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 17 17 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 18 18 19 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 19 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 20 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 21 21 SOFTWARE IS DISCLAIMED. 22 22 */ 23 23 ··· 110 110 111 111 kfree(dev); 112 112 113 - /* It's safe to call module_put() here because socket still 113 + /* It's safe to call module_put() here because socket still 114 114 holds reference to this module. */ 115 115 module_put(THIS_MODULE); 116 116 } ··· 185 185 int err = 0; 186 186 187 187 BT_DBG("id %d channel %d", req->dev_id, req->channel); 188 - 188 + 189 189 dev = kzalloc(sizeof(struct rfcomm_dev), GFP_KERNEL); 190 190 if (!dev) 191 191 return -ENOMEM; ··· 234 234 bacpy(&dev->dst, &req->dst); 235 235 dev->channel = req->channel; 236 236 237 - dev->flags = req->flags & 237 + dev->flags = req->flags & 238 238 ((1 << RFCOMM_RELEASE_ONHUP) | (1 << RFCOMM_REUSE_DLC)); 239 239 240 240 init_waitqueue_head(&dev->wait); ··· 249 249 dev->dlc = dlc; 250 250 rfcomm_dlc_unlock(dlc); 251 251 252 - /* It's safe to call __module_get() here because socket already 252 + /* It's safe to call __module_get() here because socket already 253 253 holds reference to this module. */ 254 254 __module_get(THIS_MODULE); 255 255 ··· 487 487 { 488 488 struct rfcomm_dev *dev = dlc->owner; 489 489 struct tty_struct *tty; 490 - 490 + 491 491 if (!dev || !(tty = dev->tty)) { 492 492 kfree_skb(skb); 493 493 return; ··· 506 506 struct rfcomm_dev *dev = dlc->owner; 507 507 if (!dev) 508 508 return; 509 - 509 + 510 510 BT_DBG("dlc %p dev %p err %d", dlc, dev, err); 511 511 512 512 dev->err = err; ··· 525 525 rfcomm_dev_put(dev); 526 526 rfcomm_dlc_lock(dlc); 527 527 } 528 - } else 528 + } else 529 529 tty_hangup(dev->tty); 530 530 } 531 531 } ··· 543 543 tty_hangup(dev->tty); 544 544 } 545 545 546 - dev->modem_status = 546 + dev->modem_status = 547 547 ((v24_sig & RFCOMM_V24_RTC) ? (TIOCM_DSR | TIOCM_DTR) : 0) | 548 548 ((v24_sig & RFCOMM_V24_RTR) ? (TIOCM_RTS | TIOCM_CTS) : 0) | 549 549 ((v24_sig & RFCOMM_V24_IC) ? TIOCM_RI : 0) | ··· 561 561 BT_DBG("dev %p tty %p", dev, tty); 562 562 563 563 if (test_bit(TTY_DO_WRITE_WAKEUP, &tty->flags) && tty->ldisc.write_wakeup) 564 - (tty->ldisc.write_wakeup)(tty); 564 + (tty->ldisc.write_wakeup)(tty); 565 565 566 566 wake_up_interruptible(&tty->write_wait); 567 567 #ifdef SERIAL_HAVE_POLL_WAIT ··· 576 576 struct rfcomm_dlc *dlc; 577 577 int err, id; 578 578 579 - id = tty->index; 579 + id = tty->index; 580 580 581 581 BT_DBG("tty %p id %d", tty, id); 582 582 ··· 670 670 size = min_t(uint, count, dlc->mtu); 671 671 672 672 skb = rfcomm_wmalloc(dev, size + RFCOMM_SKB_RESERVE, GFP_ATOMIC); 673 - 673 + 674 674 if (!skb) 675 675 break; 676 676 ··· 773 773 return; 774 774 775 775 /* Handle turning off CRTSCTS */ 776 - if ((old->c_cflag & CRTSCTS) && !(new->c_cflag & CRTSCTS)) 776 + if ((old->c_cflag & CRTSCTS) && !(new->c_cflag & CRTSCTS)) 777 777 BT_DBG("Turning off CRTSCTS unsupported"); 778 778 779 779 /* Parity on/off and when on, odd/even */ ··· 830 830 } 831 831 832 832 /* Handle number of data bits [5-8] */ 833 - if ((old->c_cflag & CSIZE) != (new->c_cflag & CSIZE)) 833 + if ((old->c_cflag & CSIZE) != (new->c_cflag & CSIZE)) 834 834 changes |= RFCOMM_RPN_PM_DATA; 835 835 836 836 switch (new->c_cflag & CSIZE) { ··· 868 868 case 9600: 869 869 baud = RFCOMM_RPN_BR_9600; 870 870 break; 871 - case 19200: 871 + case 19200: 872 872 baud = RFCOMM_RPN_BR_19200; 873 873 break; 874 874 case 38400: ··· 887 887 /* 9600 is standard accordinag to the RFCOMM specification */ 888 888 baud = RFCOMM_RPN_BR_9600; 889 889 break; 890 - 890 + 891 891 } 892 892 893 893 if (changes) ··· 978 978 979 979 static int rfcomm_tty_tiocmget(struct tty_struct *tty, struct file *filp) 980 980 { 981 - struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; 981 + struct rfcomm_dev *dev = (struct rfcomm_dev *) tty->driver_data; 982 982 983 983 BT_DBG("tty %p dev %p", tty, dev); 984 984 985 - return dev->modem_status; 985 + return dev->modem_status; 986 986 } 987 987 988 988 static int rfcomm_tty_tiocmset(struct tty_struct *tty, struct file *filp, unsigned int set, unsigned int clear)
+15 -15
net/bluetooth/sco.c
··· 1 - /* 1 + /* 2 2 BlueZ - Bluetooth protocol stack for Linux 3 3 Copyright (C) 2000-2001 Qualcomm Incorporated 4 4 ··· 12 12 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 13 13 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. 14 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 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 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 17 + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF 18 18 OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 19 19 20 - ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 - COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 20 + ALL LIABILITY, INCLUDING LIABILITY FOR INFRINGEMENT OF ANY PATENTS, 21 + COPYRIGHTS, TRADEMARKS OR OTHER RIGHTS, RELATING TO USE OF THIS 22 22 SOFTWARE IS DISCLAIMED. 23 23 */ 24 24 ··· 149 149 struct sco_conn *conn; 150 150 struct sock *sk; 151 151 152 - if (!(conn = hcon->sco_data)) 152 + if (!(conn = hcon->sco_data)) 153 153 return 0; 154 154 155 155 BT_DBG("hcon %p conn %p, err %d", hcon, conn, err); ··· 404 404 { 405 405 BT_DBG("sk %p", sk); 406 406 407 - if (parent) 407 + if (parent) 408 408 sk->sk_type = parent->sk_type; 409 409 } 410 410 ··· 522 522 if ((err = sco_connect(sk))) 523 523 goto done; 524 524 525 - err = bt_sock_wait_state(sk, BT_CONNECTED, 525 + err = bt_sock_wait_state(sk, BT_CONNECTED, 526 526 sock_sndtimeo(sk, flags & O_NONBLOCK)); 527 527 528 528 done: ··· 627 627 return 0; 628 628 } 629 629 630 - static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 630 + static int sco_sock_sendmsg(struct kiocb *iocb, struct socket *sock, 631 631 struct msghdr *msg, size_t len) 632 632 { 633 633 struct sock *sk = sock->sk; ··· 677 677 struct sock *sk = sock->sk; 678 678 struct sco_options opts; 679 679 struct sco_conninfo cinfo; 680 - int len, err = 0; 680 + int len, err = 0; 681 681 682 682 BT_DBG("sk %p", sk); 683 683 ··· 761 761 bt_accept_enqueue(parent, sk); 762 762 } 763 763 764 - /* Delete channel. 764 + /* Delete channel. 765 765 * Must be called on the locked socket. */ 766 766 static void sco_chan_del(struct sock *sk, int err) 767 767 { ··· 771 771 772 772 BT_DBG("sk %p, conn %p, err %d", sk, conn, err); 773 773 774 - if (conn) { 774 + if (conn) { 775 775 sco_conn_lock(conn); 776 776 conn->sk = NULL; 777 777 sco_pi(sk)->conn = NULL; ··· 855 855 conn = sco_conn_add(hcon, status); 856 856 if (conn) 857 857 sco_conn_ready(conn); 858 - } else 858 + } else 859 859 sco_conn_del(hcon, bt_err(status)); 860 860 861 861 return 0; ··· 887 887 } 888 888 889 889 drop: 890 - kfree_skb(skb); 890 + kfree_skb(skb); 891 891 return 0; 892 892 } 893 893