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

Commit 894718a6 authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Gustavo Padovan
Browse files

Bluetooth: clean up l2cap code 



Do not initialize static vars to zero, macros with complex values
shall be enclosed with (), remove unneeded braces.

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

include/net/bluetooth/l2cap.h

+5 −5
Original line number Diff line number Diff line
@@ -417,11 +417,11 @@ static inline int l2cap_tx_window_full(struct sock *sk) 
	return sub == pi->remote_tx_win;

}



#define __get_txseq(ctrl) ((ctrl) & L2CAP_CTRL_TXSEQ) >> 1

#define __get_reqseq(ctrl) ((ctrl) & L2CAP_CTRL_REQSEQ) >> 8

#define __is_iframe(ctrl) !((ctrl) & L2CAP_CTRL_FRAME_TYPE)

#define __is_sframe(ctrl) (ctrl) & L2CAP_CTRL_FRAME_TYPE

#define __is_sar_start(ctrl) ((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START

#define __get_txseq(ctrl)	(((ctrl) & L2CAP_CTRL_TXSEQ) >> 1)

#define __get_reqseq(ctrl)	(((ctrl) & L2CAP_CTRL_REQSEQ) >> 8)

#define __is_iframe(ctrl)	(!((ctrl) & L2CAP_CTRL_FRAME_TYPE))

#define __is_sframe(ctrl)	((ctrl) & L2CAP_CTRL_FRAME_TYPE)

#define __is_sar_start(ctrl)	(((ctrl) & L2CAP_CTRL_SAR) == L2CAP_SDU_START)



void l2cap_load(void);

net/bluetooth/l2cap.c

+3 −4
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 


#define VERSION "2.15"



static int disable_ertm = 0;

static int disable_ertm;



static u32 l2cap_feat_mask = L2CAP_FEAT_FIXED_CHAN;

static u8 l2cap_fixed_chan[8] = { 0x02, };
@@ -4162,13 +4162,12 @@ static inline void l2cap_data_channel_rrframe(struct sock *sk, u16 rx_control) 
			__mod_retrans_timer();



		pi->conn_state &= ~L2CAP_CONN_REMOTE_BUSY;

		if (pi->conn_state & L2CAP_CONN_SREJ_SENT) {

		if (pi->conn_state & L2CAP_CONN_SREJ_SENT)

			l2cap_send_ack(pi);

		} else {

		else

			l2cap_ertm_send(sk);

	}

}

}



static inline void l2cap_data_channel_rejframe(struct sock *sk, u16 rx_control)

{