From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
force_reliable variable inside l2cap_chan is a logical one and can
be easily converted to flag
---
include/net/bluetooth/l2cap.h | 2 +-
net/bluetooth/l2cap_core.c | 2 +-
net/bluetooth/l2cap_sock.c | 13 +++++++++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/include/net/bluetooth/l2cap.h b/include/net/bluetooth/l2cap.h
index 0d09ff7..af81a7e 100644
--- a/include/net/bluetooth/l2cap.h
+++ b/include/net/bluetooth/l2cap.h
@@ -370,7 +370,6 @@ struct l2cap_chan {
__u8 sec_level;
__u8 role_switch;
- __u8 force_reliable;
__u8 force_active;
__u8 ident;
@@ -534,6 +533,7 @@ enum {
/* Definitions for flags in l2cap_chan */
enum {
+ FLAG_FORCE_RELIABLE,
FLAG_FLUSHABLE,
FLAG_EFS_ENABLE,
FLAG_EXT_CTRL,
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index affda07..2307819 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -961,7 +961,7 @@ static void l2cap_conn_unreliable(struct l2cap_conn *conn, int err)
list_for_each_entry(chan, &conn->chan_l, list) {
struct sock *sk = chan->sk;
- if (chan->force_reliable)
+ if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
sk->sk_err = err;
}
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c
index 83596de..1ba2187 100644
--- a/net/bluetooth/l2cap_sock.c
+++ b/net/bluetooth/l2cap_sock.c
@@ -359,7 +359,7 @@ static int l2cap_sock_getsockopt_old(struct socket *sock, int optname, char __us
if (chan->role_switch)
opt |= L2CAP_LM_MASTER;
- if (chan->force_reliable)
+ if (test_bit(FLAG_FORCE_RELIABLE, &chan->flags))
opt |= L2CAP_LM_RELIABLE;
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->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;
default:
@@ -934,7 +938,8 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->tx_win = pchan->tx_win;
chan->sec_level = pchan->sec_level;
chan->role_switch = pchan->role_switch;
- chan->force_reliable = pchan->force_reliable;
+ if (test_bit(FLAG_FORCE_RELIABLE, &pchan->flags))
+ set_bit(FLAG_FORCE_RELIABLE, &chan->flags);
if (test_bit(FLAG_FLUSHABLE, &pchan->flags))
set_bit(FLAG_FLUSHABLE, &chan->flags);
chan->force_active = pchan->force_active;
@@ -966,7 +971,7 @@ static void l2cap_sock_init(struct sock *sk, struct sock *parent)
chan->tx_win = L2CAP_DEFAULT_MAX_TX_WINDOW;
chan->sec_level = BT_SECURITY_LOW;
chan->role_switch = 0;
- chan->force_reliable = 0;
+ clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
clear_bit(FLAG_FLUSHABLE, &chan->flags);
chan->force_active = BT_POWER_FORCE_ACTIVE_ON;
--
1.7.4.1
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
