* Emeltchenko Andrei <Andrei.Emeltchenko.news@xxxxxxxxx> [2011-09-07 17:08:05 +0300]:
> From: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
>
> force_reliable variable inside l2cap_chan is a logical one and can
> be easily converted to flag
>
> Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@xxxxxxxxx>
> ---
> 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 4e6fb39..1302bf5 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 f68c88d..72caee5 100644
> --- a/net/bluetooth/l2cap_core.c
> +++ b/net/bluetooth/l2cap_core.c
> @@ -964,7 +964,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 16210df..9da0ee3 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);
This one is also pointless.
Gustavo
--
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
