Commit ac73498c authored by Andrei Emeltchenko's avatar Andrei Emeltchenko Committed by Johan Hedberg
Browse files

Bluetooth: Use __constant when dealing with constants 



__constant_cpu_to_le16() is the right go here.

Signed-off-by: default avatarAndrei Emeltchenko <andrei.emeltchenko@intel.com>
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 2983fd68

net/bluetooth/l2cap_core.c

+27 −27
Original line number Diff line number Diff line
@@ -616,7 +616,7 @@ void l2cap_chan_close(struct l2cap_chan *chan, int reason) 
			rsp.scid   = cpu_to_le16(chan->dcid);

			rsp.dcid   = cpu_to_le16(chan->scid);

			rsp.result = cpu_to_le16(result);

			rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);

			rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);

			l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,

							sizeof(rsp), &rsp);

		}
@@ -1010,7 +1010,7 @@ static void l2cap_do_start(struct l2cap_chan *chan) 
			l2cap_send_conn_req(chan);

	} else {

		struct l2cap_info_req req;

		req.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);

		req.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);



		conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;

		conn->info_ident = l2cap_get_ident(conn);
@@ -1110,20 +1110,20 @@ static void l2cap_conn_start(struct l2cap_conn *conn) 
				if (test_bit(BT_SK_DEFER_SETUP,

					     &bt_sk(sk)->flags)) {

					struct sock *parent = bt_sk(sk)->parent;

					rsp.result = cpu_to_le16(L2CAP_CR_PEND);

					rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);

					rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);

					rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHOR_PEND);

					if (parent)

						parent->sk_data_ready(parent, 0);



				} else {

					__l2cap_state_change(chan, BT_CONFIG);

					rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);

					rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);

					rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);

					rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);

				}

				release_sock(sk);

			} else {

				rsp.result = cpu_to_le16(L2CAP_CR_PEND);

				rsp.status = cpu_to_le16(L2CAP_CS_AUTHEN_PEND);

				rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);

				rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHEN_PEND);

			}



			l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,
@@ -2595,9 +2595,9 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, 
	lh->len = cpu_to_le16(L2CAP_CMD_HDR_SIZE + dlen);



	if (conn->hcon->type == LE_LINK)

		lh->cid = cpu_to_le16(L2CAP_CID_LE_SIGNALING);

		lh->cid = __constant_cpu_to_le16(L2CAP_CID_LE_SIGNALING);

	else

		lh->cid = cpu_to_le16(L2CAP_CID_SIGNALING);

		lh->cid = __constant_cpu_to_le16(L2CAP_CID_SIGNALING);



	cmd = (struct l2cap_cmd_hdr *) skb_put(skb, L2CAP_CMD_HDR_SIZE);

	cmd->code  = code;
@@ -2709,8 +2709,8 @@ static void l2cap_add_opt_efs(void **ptr, struct l2cap_chan *chan) 
		efs.stype	= chan->local_stype;

		efs.msdu	= cpu_to_le16(chan->local_msdu);

		efs.sdu_itime	= cpu_to_le32(chan->local_sdu_itime);

		efs.acc_lat	= cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);

		efs.flush_to	= cpu_to_le32(L2CAP_DEFAULT_FLUSH_TO);

		efs.acc_lat	= __constant_cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);

		efs.flush_to	= __constant_cpu_to_le32(L2CAP_DEFAULT_FLUSH_TO);

		break;



	case L2CAP_MODE_STREAMING:
@@ -3290,8 +3290,8 @@ void __l2cap_connect_rsp_defer(struct l2cap_chan *chan) 


	rsp.scid   = cpu_to_le16(chan->dcid);

	rsp.dcid   = cpu_to_le16(chan->scid);

	rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);

	rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);

	rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);

	rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);

	l2cap_send_cmd(conn, chan->ident,

				L2CAP_CONN_RSP, sizeof(rsp), &rsp);
@@ -3329,8 +3329,8 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len) 
	 * did not send an RFC option.

	 */

	rfc.mode = chan->mode;

	rfc.retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);

	rfc.monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);

	rfc.retrans_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);

	rfc.monitor_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);

	rfc.max_pdu_size = cpu_to_le16(chan->imtu);



	BT_ERR("Expected RFC option was not found, using defaults");
@@ -3474,7 +3474,7 @@ sendresp: 


	if (result == L2CAP_CR_PEND && status == L2CAP_CS_NO_INFO) {

		struct l2cap_info_req info;

		info.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);

		info.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);



		conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;

		conn->info_ident = l2cap_get_ident(conn);
@@ -3596,7 +3596,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, struct l2cap_cmd_hdr 
	if (chan->state != BT_CONFIG && chan->state != BT_CONNECT2) {

		struct l2cap_cmd_rej_cid rej;



		rej.reason = cpu_to_le16(L2CAP_REJ_INVALID_CID);

		rej.reason = __constant_cpu_to_le16(L2CAP_REJ_INVALID_CID);

		rej.scid = cpu_to_le16(chan->scid);

		rej.dcid = cpu_to_le16(chan->dcid);
@@ -3886,8 +3886,8 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm 
		u8 buf[8];

		u32 feat_mask = l2cap_feat_mask;

		struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) buf;

		rsp->type   = cpu_to_le16(L2CAP_IT_FEAT_MASK);

		rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);

		rsp->type   = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);

		rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);

		if (!disable_ertm)

			feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING

							 | L2CAP_FEAT_FCS;
@@ -3907,15 +3907,15 @@ static inline int l2cap_information_req(struct l2cap_conn *conn, struct l2cap_cm 
		else

			l2cap_fixed_chan[0] &= ~L2CAP_FC_A2MP;



		rsp->type   = cpu_to_le16(L2CAP_IT_FIXED_CHAN);

		rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);

		rsp->type   = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);

		rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);

		memcpy(rsp->data, l2cap_fixed_chan, sizeof(l2cap_fixed_chan));

		l2cap_send_cmd(conn, cmd->ident,

					L2CAP_INFO_RSP, sizeof(buf), buf);

	} else {

		struct l2cap_info_rsp rsp;

		rsp.type   = cpu_to_le16(type);

		rsp.result = cpu_to_le16(L2CAP_IR_NOTSUPP);

		rsp.result = __constant_cpu_to_le16(L2CAP_IR_NOTSUPP);

		l2cap_send_cmd(conn, cmd->ident,

					L2CAP_INFO_RSP, sizeof(rsp), &rsp);

	}
@@ -3955,7 +3955,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm 


		if (conn->feat_mask & L2CAP_FEAT_FIXED_CHAN) {

			struct l2cap_info_req req;

			req.type = cpu_to_le16(L2CAP_IT_FIXED_CHAN);

			req.type = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);



			conn->info_ident = l2cap_get_ident(conn);
@@ -4190,9 +4190,9 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn, 


	err = l2cap_check_conn_param(min, max, latency, to_multiplier);

	if (err)

		rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);

		rsp.result = __constant_cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);

	else

		rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);

		rsp.result = __constant_cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);



	l2cap_send_cmd(conn, cmd->ident, L2CAP_CONN_PARAM_UPDATE_RSP,

							sizeof(rsp), &rsp);
@@ -4340,7 +4340,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn, 
			BT_ERR("Wrong link type (%d)", err);



			/* FIXME: Map err to a valid reason */

			rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);

			rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);

			l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ, sizeof(rej), &rej);

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE