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

Commit e8235c6b authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Marcel Holtmann
Browse files

Bluetooth: Use a l2cap_pinfo struct instead l2cap_pi() macro 



Trivial clean up.

Signed-off-by: default avatarGustavo F. Padovan <padovan@profusion.mobi>
Reviewed-by: default avatarJoão Paulo Rechi Vita <jprvita@profusion.mobi>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent d1daa091

net/bluetooth/l2cap.c

+6 −6
Original line number Diff line number Diff line
@@ -1291,7 +1291,7 @@ static int l2cap_streaming_send(struct sock *sk) 
		control |= pi->next_tx_seq << L2CAP_CTRL_TXSEQ_SHIFT;

		put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);



		if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) {

		if (pi->fcs == L2CAP_FCS_CRC16) {

			fcs = crc16(0, (u8 *)tx_skb->data, tx_skb->len - 2);

			put_unaligned_le16(fcs, tx_skb->data + tx_skb->len - 2);

		}
@@ -1344,7 +1344,7 @@ static int l2cap_retransmit_frame(struct sock *sk, u8 tx_seq) 
				| (tx_seq << L2CAP_CTRL_TXSEQ_SHIFT);

		put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);



		if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) {

		if (pi->fcs == L2CAP_FCS_CRC16) {

			fcs = crc16(0, (u8 *)tx_skb->data, tx_skb->len - 2);

			put_unaligned_le16(fcs, tx_skb->data + tx_skb->len - 2);

		}
@@ -1388,7 +1388,7 @@ static int l2cap_ertm_send(struct sock *sk) 
		put_unaligned_le16(control, tx_skb->data + L2CAP_HDR_SIZE);





		if (l2cap_pi(sk)->fcs == L2CAP_FCS_CRC16) {

		if (pi->fcs == L2CAP_FCS_CRC16) {

			fcs = crc16(0, (u8 *)skb->data, tx_skb->len - 2);

			put_unaligned_le16(fcs, skb->data + tx_skb->len - 2);

		}
@@ -3518,10 +3518,10 @@ static inline int l2cap_data_channel_sframe(struct sock *sk, u16 rx_control, str 
		pi->expected_ack_seq = tx_seq;

		l2cap_drop_acked_frames(sk);



		del_timer(&l2cap_pi(sk)->retrans_timer);

		del_timer(&pi->retrans_timer);

		if (rx_control & L2CAP_CTRL_POLL) {

			u16 control = L2CAP_CTRL_FINAL;

			l2cap_send_rr_or_rnr(l2cap_pi(sk), control);

			l2cap_send_rr_or_rnr(pi, control);

		}

		break;

	}
@@ -3622,7 +3622,7 @@ static inline int l2cap_data_channel(struct l2cap_conn *conn, u16 cid, struct sk 
		goto done;



	default:

		BT_DBG("sk %p: bad mode 0x%2.2x", sk, l2cap_pi(sk)->mode);

		BT_DBG("sk %p: bad mode 0x%2.2x", sk, pi->mode);

		break;

	}