renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-22 12:33:59 +08:00
Code

Bluetooth: convert force_reliable variable to flag in l2cap chan

Browse Source 
force_reliable 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:32 +03:00 committed by Gustavo F. Padovan
parent d57b0e8b89
commit ecf61bdba8
3 changed files with 8 additions and 6 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 sec_level;
__u8 role_switch; __u8 role_switch;
__u8 force_reliable;
__u8 force_active; __u8 force_active;
__u8 ident; __u8 ident;
@ -465,6 +464,7 @@ enum {
/* Definitions for flags in l2cap_chan */ /* Definitions for flags in l2cap_chan */
enum { enum {
FLAG_FORCE_RELIABLE,
FLAG_FLUSHABLE, FLAG_FLUSHABLE,
}; };

2
net/bluetooth/l2cap_core.c
View File

@ -948,7 +948,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
list_for_each_entry(chan, &conn->chan_l, list) { list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk; struct sock *sk = chan->sk;
if (chan->force_reliable) if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
sk->sk_err = err; sk->sk_err = err;
} }

10
net/bluetooth/l2cap_sock.c
View File

@ -359,7 +359,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
if (chan->role_switch) if (chan->role_switch)
opt |= L2CAP_LM_MASTER; opt |= L2CAP_LM_MASTER;
if (chan->force_reliable) if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
opt |= L2CAP_LM_RELIABLE; opt |= L2CAP_LM_RELIABLE;
if (put_user(opt, (u32 __user *) optval)) if (put_user(opt, (u32 __user *) optval))
@ -550,7 +550,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname, char __us
chan->sec_level = BT_SECURITY_HIGH; chan->sec_level = BT_SECURITY_HIGH;
chan->role_switch = (opt & L2CAP_LM_MASTER); chan->role_switch = (opt & L2CAP_LM_MASTER);
chan->force_reliable = (opt & L2CAP_LM_RELIABLE);
if (opt & L2CAP_LM_RELIABLE)
set_bit(FLAG_FORCE_RELIABLE, &chan->flags);
else
clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
break; break;
default: default:
@ -934,7 +938,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->tx_win = pchan->tx_win; chan->tx_win = pchan->tx_win;
chan->sec_level = pchan->sec_level; chan->sec_level = pchan->sec_level;
chan->role_switch = pchan->role_switch; chan->role_switch = pchan->role_switch;
chan->force_reliable = pchan->force_reliable;
chan->flags = pchan->flags; chan->flags = pchan->flags;
chan->force_active = pchan->force_active; chan->force_active = pchan->force_active;
} else { } else {
@ -965,7 +968,6 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->tx_win = L2CAP_DEFAULT_TX_WINDOW; chan->tx_win = L2CAP_DEFAULT_TX_WINDOW;
chan->sec_level = BT_SECURITY_LOW; chan->sec_level = BT_SECURITY_LOW;
chan->role_switch = 0; chan->role_switch = 0;
chan->force_reliable = 0;
chan->flags = 0; chan->flags = 0;
chan->force_active = BT_POWER_FORCE_ACTIVE_ON; chan->force_active = BT_POWER_FORCE_ACTIVE_ON;