Merge branch 'kvm-updates-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / net / bluetooth / bnep / bnep.h

diff --git a/net/bluetooth/bnep/bnep.h b/net/bluetooth/bnep/bnep.h
index 0b6cd0e2528d4eb64e2f35addbd5869fc619a925..b69bf4e7c48b8f8ab9d874ba691d6f21397f531e 100644 (file)
--- 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.
@@ -16,10 +16,6 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 */
 
-/*
- * $Id: bnep.h,v 1.5 2002/08/04 21:23:58 maxk Exp $
- */
-
 #ifndef _BNEP_H
 #define _BNEP_H
 
@@ -60,7 +56,7 @@
 // Extension types
 #define BNEP_EXT_CONTROL           0x00
 
-// Response messages 
+// Response messages
 #define BNEP_SUCCESS               0x00
 
 #define BNEP_CONN_INVALID_DST      0x01
@@ -81,7 +77,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 +128,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 +151,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 +162,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;
@@ -174,11 +170,11 @@ struct bnep_session {
 
 void bnep_net_setup(struct net_device *dev);
 int bnep_sock_init(void);
-int bnep_sock_cleanup(void);
+void 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