diff options
| author | Andrei Emeltchenko <andrei.emeltchenko@nokia.com> | 2010-12-01 16:58:23 +0200 |
|---|---|---|
| committer | Gustavo F. Padovan <padovan@profusion.mobi> | 2010-12-01 21:04:43 -0200 |
| commit | 285b4e90318dcf421a00b2ac3fe8ab713f3281e3 (patch) | |
| tree | 2f69b35603f0c68288e364cc41de96e502ee511b /net/bluetooth/rfcomm/core.c | |
| parent | 735cbc4784a084b7a76c43c69f9dba683bb3b48b (diff) | |
| download | kernel_samsung_aries-285b4e90318dcf421a00b2ac3fe8ab713f3281e3.zip kernel_samsung_aries-285b4e90318dcf421a00b2ac3fe8ab713f3281e3.tar.gz kernel_samsung_aries-285b4e90318dcf421a00b2ac3fe8ab713f3281e3.tar.bz2 | |
Bluetooth: clean up rfcomm code
Remove extra spaces, assignments in if statement, zeroing static
variables, extra braces. Fix includes.
Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@nokia.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Diffstat (limited to 'net/bluetooth/rfcomm/core.c')
| -rw-r--r-- | net/bluetooth/rfcomm/core.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index fa642aa..c1e2bba 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c @@ -41,7 +41,7 @@ #include <linux/slab.h> #include <net/sock.h> -#include <asm/uaccess.h> +#include <linux/uaccess.h> #include <asm/unaligned.h> #include <net/bluetooth/bluetooth.h> @@ -51,10 +51,10 @@ #define VERSION "1.11" -static int disable_cfc = 0; +static int disable_cfc; +static int l2cap_ertm; static int channel_mtu = -1; static unsigned int l2cap_mtu = RFCOMM_MAX_L2CAP_MTU; -static int l2cap_ertm = 0; static struct task_struct *rfcomm_thread; @@ -1901,7 +1901,7 @@ static inline void rfcomm_check_connection(struct rfcomm_session *s) BT_DBG("%p state %ld", s, s->state); - switch(sk->sk_state) { + switch (sk->sk_state) { case BT_CONNECTED: s->state = BT_CONNECT; |