Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-12 07:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bluetooth: convert force_active variable to flag in l2cap chan

Browse Source 
force_active variable inside l2cap_chan is a logical one and can
be easily converted to flag

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Andrei Emeltchenko 2011-10-11 14:04:33 +03:00 committed by Gustavo F. Padovan
parent ecf61bdba8
commit 15770b1ab9
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/l2cap.h
View File

@ -325,7 +325,6 @@ struct l2cap_chan {
__u8 sec_level;
__u8 role_switch;
__u8 force_active;
__u8 ident;
@ -464,6 +463,7 @@ enum {
/* Definitions for flags in l2cap_chan */
enum {
FLAG_FORCE_ACTIVE,
FLAG_FORCE_RELIABLE,
FLAG_FLUSHABLE,
};

4
net/bluetooth/l2cap_core.c
View File

@ -605,7 +605,7 @@ static inline void l2cap_send_sframe(struct l2cap_chan *chan, u16 control)
else
flags = ACL_START;
bt_cb(skb)->force_active = chan->force_active;
bt_cb(skb)->force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
hci_send_acl(chan->conn->hcon, skb, flags);
}
@ -1259,7 +1259,7 @@ static void l2cap_do_send(struct l2cap_chan *chan, struct sk_buff *skb)
else
flags = ACL_START;
bt_cb(skb)->force_active = chan->force_active;
bt_cb(skb)->force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
hci_send_acl(hcon, skb, flags);
}

12
net/bluetooth/l2cap_sock.c
View File

@ -459,7 +459,7 @@ static int l2cap_sock_getsockopt(struct socket *sock, int level, int optname, ch
break;
}
pwr.force_active = chan->force_active;
pwr.force_active = test_bit(FLAG_FORCE_ACTIVE, &chan->flags);
len = min_t(unsigned int, len, sizeof(pwr));
if (copy_to_user(optval, (char *) &pwr, len))
@ -680,7 +680,11 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname, ch
err = -EFAULT;
break;
}
chan->force_active = pwr.force_active;
if (pwr.force_active)
set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
else
clear_bit(FLAG_FORCE_ACTIVE, &chan->flags);
break;
default:
@ -939,7 +943,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->sec_level = pchan->sec_level;
chan->role_switch = pchan->role_switch;
chan->flags = pchan->flags;
chan->force_active = pchan->force_active;
} else {
switch (sk->sk_type) {
@ -969,8 +972,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->sec_level = BT_SECURITY_LOW;
chan->role_switch = 0;
chan->flags = 0;
chan->force_active = BT_POWER_FORCE_ACTIVE_ON;
set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
}
/* Default config options */