[NET] BLUETOOTH: Fix whitespace errors.

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

4 files changed, 65 insertions, 65 deletions

diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h
index 0b6cd0e2528d..a2992280c3d1 100644
--- a/net/bluetooth/bnep/bnep.h
+++ b/net/bluetooth/bnep/bnep.h
@@ -1,7 +1,7 @@
 /*
   BNEP protocol definition for Linux Bluetooth stack (BlueZ).
   Copyright (C) 2002 Maxim Krasnyansky <maxk@qualcomm.com>
-        
+
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License, version 2, as
   published by the Free Software Foundation.
@@ -60,7 +60,7 @@
 // Extension types
 #define BNEP_EXT_CONTROL           0x00
 
-// Response messages 
+// Response messages
 #define BNEP_SUCCESS               0x00
 
 #define BNEP_CONN_INVALID_DST      0x01
@@ -81,7 +81,7 @@
 #define BNEP_CONNECT_TO  15
 #define BNEP_FILTER_TO   15
 
-// Headers 
+// Headers
 #define BNEP_TYPE_MASK   0x7f
 #define BNEP_EXT_HEADER  0x80
 
@@ -132,7 +132,7 @@ struct bnep_conndel_req {
 struct bnep_conninfo {
         __u32 flags;
         __u16 role;
-        __u16 state;    
+        __u16 state;
         __u8  dst[ETH_ALEN];
         char  device[16];
 };
@@ -155,10 +155,10 @@ int bnep_get_conninfo(struct bnep_conninfo *ci);
 // BNEP sessions
 struct bnep_session {
         struct list_head list;
-        
+
         unsigned int  role;
-        unsigned long state;
-        unsigned long flags;
+        unsigned long state;
+        unsigned long flags;
         atomic_t      killed;
 
         struct ethhdr eh;
@@ -166,7 +166,7 @@ struct bnep_session {
 
         struct bnep_proto_filter proto_filter[BNEP_MAX_PROTO_FILTERS];
         u64    mc_filter;
-        
+
         struct socket    *sock;
         struct net_device *dev;
         struct net_device_stats stats;
@@ -178,7 +178,7 @@ int bnep_sock_cleanup(void);
 
 static inline int bnep_mc_hash(__u8 *addr)
 {
-        return (crc32_be(~0, addr, ETH_ALEN) >> 26);
+        return (crc32_be(~0, addr, ETH_ALEN) >> 26);
 }
 
 #endif
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 7ba6470dc507..b85d1492c357 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -1,4 +1,4 @@
-/* 
+/*
    BNEP implementation for Linux Bluetooth stack (BlueZ).
    Copyright (C) 2001-2002 Inventel Systemes
    Written 2001-2002 by
@@ -15,19 +15,19 @@
    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.
 
-   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.
 */
 
 /*
  * $Id: core.c,v 1.20 2002/08/04 21:23:58 maxk Exp $
- */ 
+ */
 
 #include <linux/module.h>
 
@@ -74,7 +74,7 @@ static struct bnep_session *__bnep_get_session(u8 *dst)
         BT_DBG("");
 
         list_for_each(p, &bnep_session_list) {
-                s = list_entry(p, struct bnep_session, list);   
+                s = list_entry(p, struct bnep_session, list);
                 if (!compare_ether_addr(dst, s->eh.h_source))
                         return s;
         }
@@ -87,7 +87,7 @@ static void __bnep_link_session(struct bnep_session *s)
            by the socket layer which has to hold the refference to this module.
          */
         __module_get(THIS_MODULE);
-        list_add(&s->list, &bnep_session_list); 
+        list_add(&s->list, &bnep_session_list);
 }
 
 static void __bnep_unlink_session(struct bnep_session *s)
@@ -203,7 +203,7 @@ static int bnep_ctrl_set_mcfilter(struct bnep_session *s, u8 *data, int len)
 
                         memcpy(a1, data, ETH_ALEN); data += ETH_ALEN;
                         a2 = data; data += ETH_ALEN;
-        
+
                         BT_DBG("mc filter %s -> %s",
                                 batostr((void *) a1), batostr((void *) a2));
 
@@ -277,7 +277,7 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)
                 }
 
                 BT_DBG("type 0x%x len %d", h->type, h->len);
-        
+
                 switch (h->type & BNEP_TYPE_MASK) {
                 case BNEP_EXT_CONTROL:
                         bnep_rx_control(s, skb->data, skb->len);
@@ -293,7 +293,7 @@ static int bnep_rx_extension(struct bnep_session *s, struct sk_buff *skb)
                         break;
                 }
         } while (!err && (h->type & BNEP_EXT_HEADER));
-        
+
         return err;
 }
 
@@ -319,7 +319,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 
         if ((type & BNEP_TYPE_MASK) > BNEP_RX_TYPES)
                 goto badframe;
-        
+
         if ((type & BNEP_TYPE_MASK) == BNEP_CONTROL) {
                 bnep_rx_control(s, skb->data, skb->len);
                 kfree_skb(skb);
@@ -345,7 +345,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
                         goto badframe;
                 s->eh.h_proto = get_unaligned((__be16 *) (skb->data - 2));
         }
-        
+
         /* We have to alloc new skb and copy data here :(. Because original skb
          * may not be modified and because of the alignment requirements. */
         nskb = alloc_skb(2 + ETH_HLEN + skb->len, GFP_KERNEL);
@@ -361,7 +361,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
         case BNEP_COMPRESSED:
                 memcpy(__skb_put(nskb, ETH_HLEN), &s->eh, ETH_HLEN);
                 break;
-        
+
         case BNEP_COMPRESSED_SRC_ONLY:
                 memcpy(__skb_put(nskb, ETH_ALEN), s->eh.h_dest, ETH_ALEN);
                 memcpy(__skb_put(nskb, ETH_ALEN), skb->mac.raw, ETH_ALEN);
@@ -381,7 +381,7 @@ static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
 
         memcpy(__skb_put(nskb, skb->len), skb->data, skb->len);
         kfree_skb(skb);
-        
+
         s->stats.rx_packets++;
         nskb->dev       = dev;
         nskb->ip_summed = CHECKSUM_NONE;
@@ -435,7 +435,7 @@ static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
                 iv[il++] = (struct kvec) { eh->h_source, ETH_ALEN };
                 len += ETH_ALEN;
                 break;
-                
+
         case BNEP_COMPRESSED_DST_ONLY:
                 iv[il++] = (struct kvec) { eh->h_dest, ETH_ALEN };
                 len += ETH_ALEN;
@@ -445,7 +445,7 @@ static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
 send:
         iv[il++] = (struct kvec) { skb->data, skb->len };
         len += skb->len;
-        
+
         /* FIXME: linearize skb */
         {
                 len = kernel_sendmsg(sock, &s->msg, iv, il, len);
@@ -471,7 +471,7 @@ static int bnep_session(void *arg)
 
         BT_DBG("");
 
-        daemonize("kbnepd %s", dev->name);
+        daemonize("kbnepd %s", dev->name);
         set_user_nice(current, -15);
         current->flags |= PF_NOFREEZE;
 
@@ -488,13 +488,13 @@ static int bnep_session(void *arg)
 
                 if (sk->sk_state != BT_CONNECTED)
                         break;
-        
+
                 // TX
                 while ((skb = skb_dequeue(&sk->sk_write_queue)))
                         if (bnep_tx_frame(s, skb))
                                 break;
                 netif_wake_queue(dev);
-        
+
                 schedule();
         }
         set_current_state(TASK_RUNNING);
@@ -573,7 +573,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
         s->sock  = sock;
         s->role  = req->role;
         s->state = BT_CONNECTED;
-        
+
         s->msg.msg_flags = MSG_NOSIGNAL;
 
 #ifdef CONFIG_BT_BNEP_MC_FILTER
@@ -594,7 +594,7 @@ int bnep_add_connection(struct bnep_connadd_req *req, struct socket *sock)
         }
 
         __bnep_link_session(s);
-        
+
         err = kernel_thread(bnep_session, s, CLONE_KERNEL);
         if (err < 0) {
                 /* Session thread start failed, gotta cleanup. */
@@ -627,7 +627,7 @@ int bnep_del_connection(struct bnep_conndel_req *req)
                 /* Wakeup user-space which is polling for socket errors.
                  * This is temporary hack untill we have shutdown in L2CAP */
                 s->sock->sk->sk_err = EUNATCH;
-                
+
                 /* Kill session thread */
                 atomic_inc(&s->killed);
                 wake_up_interruptible(s->sock->sk->sk_sleep);
@@ -661,7 +661,7 @@ int bnep_get_connlist(struct bnep_connlist_req *req)
                 s = list_entry(p, struct bnep_session, list);
 
                 __bnep_copy_ci(&ci, s);
-                
+
                 if (copy_to_user(req->ci, &ci, sizeof(ci))) {
                         err = -EFAULT;
                         break;
@@ -696,7 +696,7 @@ int bnep_get_conninfo(struct bnep_conninfo *ci)
 }
 
 static int __init bnep_init(void)
-{       
+{
         char flt[50] = "";
 
         l2cap_load();
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index 67a002a9751a..9092816f58de 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -1,4 +1,4 @@
-/* 
+/*
    BNEP implementation for Linux Bluetooth stack (BlueZ).
    Copyright (C) 2001-2002 Inventel Systemes
    Written 2001-2002 by
@@ -15,19 +15,19 @@
    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.
 
-   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.
 */
 
 /*
  * $Id: netdev.c,v 1.8 2002/08/04 21:23:58 maxk Exp $
- */ 
+ */
 
 #include <linux/module.h>
 
@@ -94,7 +94,7 @@ static void bnep_net_set_mc_list(struct net_device *dev)
         r->type = BNEP_CONTROL;
         r->ctrl = BNEP_FILTER_MULTI_ADDR_SET;
 
-        if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) {
+        if (dev->flags & (IFF_PROMISC | IFF_ALLMULTI)) {
                 u8 start[ETH_ALEN] = { 0x01 };
 
                 /* Request all addresses */
@@ -102,14 +102,14 @@ static void bnep_net_set_mc_list(struct net_device *dev)
                 memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN);
                 r->len = htons(ETH_ALEN * 2);
         } else {
-                struct dev_mc_list *dmi = dev->mc_list;
+                struct dev_mc_list *dmi = dev->mc_list;
                 int i, len = skb->len;
 
                 if (dev->flags & IFF_BROADCAST) {
                         memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN);
                         memcpy(__skb_put(skb, ETH_ALEN), dev->broadcast, ETH_ALEN);
-                }       
-                
+                }
+
                 /* FIXME: We should group addresses here. */
 
                 for (i = 0; i < dev->mc_count && i < BNEP_MAX_MULTICAST_FILTERS; i++) {
@@ -159,13 +159,13 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
 {
         struct ethhdr *eh = (void *) skb->data;
         u16 proto = ntohs(eh->h_proto);
-        
+
         if (proto >= 1536)
                 return proto;
-                
+
         if (get_unaligned((__be16 *) skb->data) == htons(0xFFFF))
                 return ETH_P_802_3;
-                
+
         return ETH_P_802_2;
 }
 
@@ -174,7 +174,7 @@ static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session
         u16 proto = bnep_net_eth_proto(skb);
         struct bnep_proto_filter *f = s->proto_filter;
         int i;
-        
+
         for (i = 0; i < BNEP_MAX_PROTO_FILTERS && f[i].end; i++) {
                 if (proto >= f[i].start && proto <= f[i].end)
                         return 0;
@@ -198,14 +198,14 @@ static int bnep_net_xmit(struct sk_buff *skb, struct net_device *dev)
                 return 0;
         }
 #endif
-        
+
 #ifdef CONFIG_BT_BNEP_PROTO_FILTER
         if (bnep_net_proto_filter(skb, s)) {
                 kfree_skb(skb);
                 return 0;
         }
 #endif
-        
+
         /*
          * We cannot send L2CAP packets from here as we are potentially in a bh.
          * So we have to queue them and wake up session thread which is sleeping
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c
index 5563db1bf526..6d7311cee1b4 100644
--- a/net/bluetooth/bnep/sock.c
+++ b/net/bluetooth/bnep/sock.c
@@ -1,4 +1,4 @@
-/* 
+/*
    BNEP implementation for Linux Bluetooth stack (BlueZ).
    Copyright (C) 2001-2002 Inventel Systemes
    Written 2001-2002 by
@@ -14,19 +14,19 @@
    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.
 
-   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.
 */
 
 /*
  * $Id: sock.c,v 1.4 2002/08/04 21:23:58 maxk Exp $
- */ 
+ */
 
 #include <linux/module.h>
 
@@ -89,7 +89,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
                 if (copy_from_user(&ca, argp, sizeof(ca)))
                         return -EFAULT;
-        
+
                 nsock = sockfd_lookup(ca.sock, &err);
                 if (!nsock)
                         return err;
@@ -101,20 +101,20 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
                 err = bnep_add_connection(&ca, nsock);
                 if (!err) {
-                        if (copy_to_user(argp, &ca, sizeof(ca)))
+                        if (copy_to_user(argp, &ca, sizeof(ca)))
                                 err = -EFAULT;
                 } else
                         fput(nsock->file);
 
                 return err;
-        
+
         case BNEPCONNDEL:
                 if (!capable(CAP_NET_ADMIN))
                         return -EACCES;
 
                 if (copy_from_user(&cd, argp, sizeof(cd)))
                         return -EFAULT;
-        
+
                 return bnep_del_connection(&cd);
 
         case BNEPGETCONNLIST:
@@ -123,7 +123,7 @@ static int bnep_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long
 
                 if (cl.cnum <= 0)
                         return -EINVAL;
-        
+
                 err = bnep_get_connlist(&cl);
                 if (!err && copy_to_user(argp, &cl, sizeof(cl)))
                         return -EFAULT;
@@ -163,7 +163,7 @@ static int bnep_sock_compat_ioctl(struct socket *sock, unsigned int cmd, unsigne
 
                 if (cl.cnum <= 0)
                         return -EINVAL;
-        
+
                 err = bnep_get_connlist(&cl);
 
                 if (!err && put_user(cl.cnum, (uint32_t __user *) arg))