Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15770b1a authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: convert force_active variable to flag in l2cap chan 



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

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
parent ecf61bdb

include/net/bluetooth/l2cap.h

+1 −1
Original line number Diff line number Diff line
@@ -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,

};

net/bluetooth/l2cap_core.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

}

net/bluetooth/l2cap_sock.c

+7 −5
Original line number Diff line number Diff line
@@ -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 */