Bluetooth: Convert uses of __constant_<foo> to <foo>
The use of __constant_<foo> has been unnecessary for quite awhile now. Make these uses consistent with the rest of the kernel. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
This commit is contained in:
Joe Perches
Marcel Holtmann
parent
4340a124de
commit
dcf4adbfdc
11 changed files with 96 additions and 96 deletions
|
|
@ -162,7 +162,7 @@ static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb,
|
|||
return -ENOMEM;
|
||||
}
|
||||
|
||||
rsp->mtu = __constant_cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
|
||||
rsp->mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);
|
||||
rsp->ext_feat = 0;
|
||||
|
||||
__a2mp_add_cl(mgr, rsp->cl);
|
||||
|
|
@ -649,7 +649,7 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb)
|
|||
if (err) {
|
||||
struct a2mp_cmd_rej rej;
|
||||
|
||||
rej.reason = __constant_cpu_to_le16(0);
|
||||
rej.reason = cpu_to_le16(0);
|
||||
hdr = (void *) skb->data;
|
||||
|
||||
BT_DBG("Send A2MP Rej: cmd 0x%2.2x err %d", hdr->code, err);
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ static void hci_acl_create_connection(struct hci_conn *conn)
|
|||
cp.pscan_rep_mode = ie->data.pscan_rep_mode;
|
||||
cp.pscan_mode = ie->data.pscan_mode;
|
||||
cp.clock_offset = ie->data.clock_offset |
|
||||
__constant_cpu_to_le16(0x8000);
|
||||
cpu_to_le16(0x8000);
|
||||
}
|
||||
|
||||
memcpy(conn->dev_class, ie->data.dev_class, 3);
|
||||
|
|
@ -182,8 +182,8 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle)
|
|||
|
||||
cp.handle = cpu_to_le16(handle);
|
||||
|
||||
cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.tx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.voice_setting = cpu_to_le16(conn->setting);
|
||||
|
||||
switch (conn->setting & SCO_AIRMODE_MASK) {
|
||||
|
|
@ -225,8 +225,8 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max,
|
|||
cp.conn_interval_max = cpu_to_le16(max);
|
||||
cp.conn_latency = cpu_to_le16(latency);
|
||||
cp.supervision_timeout = cpu_to_le16(to_multiplier);
|
||||
cp.min_ce_len = __constant_cpu_to_le16(0x0000);
|
||||
cp.max_ce_len = __constant_cpu_to_le16(0x0000);
|
||||
cp.min_ce_len = cpu_to_le16(0x0000);
|
||||
cp.max_ce_len = cpu_to_le16(0x0000);
|
||||
|
||||
hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp);
|
||||
}
|
||||
|
|
@ -337,9 +337,9 @@ static void hci_conn_idle(struct work_struct *work)
|
|||
if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {
|
||||
struct hci_cp_sniff_subrate cp;
|
||||
cp.handle = cpu_to_le16(conn->handle);
|
||||
cp.max_latency = __constant_cpu_to_le16(0);
|
||||
cp.min_remote_timeout = __constant_cpu_to_le16(0);
|
||||
cp.min_local_timeout = __constant_cpu_to_le16(0);
|
||||
cp.max_latency = cpu_to_le16(0);
|
||||
cp.min_remote_timeout = cpu_to_le16(0);
|
||||
cp.min_local_timeout = cpu_to_le16(0);
|
||||
hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);
|
||||
}
|
||||
|
||||
|
|
@ -348,8 +348,8 @@ static void hci_conn_idle(struct work_struct *work)
|
|||
cp.handle = cpu_to_le16(conn->handle);
|
||||
cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);
|
||||
cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);
|
||||
cp.attempt = __constant_cpu_to_le16(4);
|
||||
cp.timeout = __constant_cpu_to_le16(1);
|
||||
cp.attempt = cpu_to_le16(4);
|
||||
cp.timeout = cpu_to_le16(1);
|
||||
hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);
|
||||
}
|
||||
}
|
||||
|
|
@ -596,9 +596,9 @@ static void hci_req_add_le_create_conn(struct hci_request *req,
|
|||
cp.own_address_type = own_addr_type;
|
||||
cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval);
|
||||
cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval);
|
||||
cp.supervision_timeout = __constant_cpu_to_le16(0x002a);
|
||||
cp.min_ce_len = __constant_cpu_to_le16(0x0000);
|
||||
cp.max_ce_len = __constant_cpu_to_le16(0x0000);
|
||||
cp.supervision_timeout = cpu_to_le16(0x002a);
|
||||
cp.min_ce_len = cpu_to_le16(0x0000);
|
||||
cp.max_ce_len = cpu_to_le16(0x0000);
|
||||
|
||||
hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);
|
||||
|
||||
|
|
|
|||
|
|
@ -1349,7 +1349,7 @@ static void bredr_setup(struct hci_request *req)
|
|||
hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &flt_type);
|
||||
|
||||
/* Connection accept timeout ~20 secs */
|
||||
param = __constant_cpu_to_le16(0x7d00);
|
||||
param = cpu_to_le16(0x7d00);
|
||||
hci_req_add(req, HCI_OP_WRITE_CA_TIMEOUT, 2, ¶m);
|
||||
|
||||
/* AVM Berlin (31), aka "BlueFRITZ!", reports version 1.2,
|
||||
|
|
|
|||
|
|
@ -1924,9 +1924,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
bacpy(&cp.bdaddr, &ev->bdaddr);
|
||||
cp.pkt_type = cpu_to_le16(conn->pkt_type);
|
||||
|
||||
cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.max_latency = __constant_cpu_to_le16(0xffff);
|
||||
cp.tx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.max_latency = cpu_to_le16(0xffff);
|
||||
cp.content_format = cpu_to_le16(hdev->voice_setting);
|
||||
cp.retrans_effort = 0xff;
|
||||
|
||||
|
|
|
|||
|
|
@ -211,22 +211,22 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb)
|
|||
|
||||
switch (bt_cb(skb)->pkt_type) {
|
||||
case HCI_COMMAND_PKT:
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_COMMAND_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_COMMAND_PKT);
|
||||
break;
|
||||
case HCI_EVENT_PKT:
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_EVENT_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_EVENT_PKT);
|
||||
break;
|
||||
case HCI_ACLDATA_PKT:
|
||||
if (bt_cb(skb)->incoming)
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_ACL_RX_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_ACL_RX_PKT);
|
||||
else
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_ACL_TX_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_ACL_TX_PKT);
|
||||
break;
|
||||
case HCI_SCODATA_PKT:
|
||||
if (bt_cb(skb)->incoming)
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_SCO_RX_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_SCO_RX_PKT);
|
||||
else
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_SCO_TX_PKT);
|
||||
opcode = cpu_to_le16(HCI_MON_SCO_TX_PKT);
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
|
|
@ -319,7 +319,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)
|
|||
bacpy(&ni->bdaddr, &hdev->bdaddr);
|
||||
memcpy(ni->name, hdev->name, 8);
|
||||
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_NEW_INDEX);
|
||||
opcode = cpu_to_le16(HCI_MON_NEW_INDEX);
|
||||
break;
|
||||
|
||||
case HCI_DEV_UNREG:
|
||||
|
|
@ -327,7 +327,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event)
|
|||
if (!skb)
|
||||
return NULL;
|
||||
|
||||
opcode = __constant_cpu_to_le16(HCI_MON_DEL_INDEX);
|
||||
opcode = cpu_to_le16(HCI_MON_DEL_INDEX);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -665,7 +665,7 @@ static void l2cap_chan_connect_reject(struct l2cap_chan *chan)
|
|||
rsp.scid = cpu_to_le16(chan->dcid);
|
||||
rsp.dcid = cpu_to_le16(chan->scid);
|
||||
rsp.result = cpu_to_le16(result);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
|
||||
l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP, sizeof(rsp), &rsp);
|
||||
}
|
||||
|
|
@ -727,7 +727,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
|
|||
}
|
||||
break;
|
||||
case L2CAP_CHAN_CONN_LESS:
|
||||
if (chan->psm == __constant_cpu_to_le16(L2CAP_PSM_3DSP)) {
|
||||
if (chan->psm == cpu_to_le16(L2CAP_PSM_3DSP)) {
|
||||
if (chan->sec_level == BT_SECURITY_LOW)
|
||||
chan->sec_level = BT_SECURITY_SDP;
|
||||
}
|
||||
|
|
@ -738,7 +738,7 @@ static inline u8 l2cap_get_auth_type(struct l2cap_chan *chan)
|
|||
return HCI_AT_NO_BONDING;
|
||||
break;
|
||||
case L2CAP_CHAN_CONN_ORIENTED:
|
||||
if (chan->psm == __constant_cpu_to_le16(L2CAP_PSM_SDP)) {
|
||||
if (chan->psm == cpu_to_le16(L2CAP_PSM_SDP)) {
|
||||
if (chan->sec_level == BT_SECURITY_LOW)
|
||||
chan->sec_level = BT_SECURITY_SDP;
|
||||
|
||||
|
|
@ -1273,7 +1273,7 @@ static void l2cap_do_start(struct l2cap_chan *chan)
|
|||
}
|
||||
} else {
|
||||
struct l2cap_info_req req;
|
||||
req.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
req.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
|
||||
conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;
|
||||
conn->info_ident = l2cap_get_ident(conn);
|
||||
|
|
@ -1370,18 +1370,18 @@ static void l2cap_conn_start(struct l2cap_conn *conn)
|
|||
|
||||
if (l2cap_chan_check_security(chan)) {
|
||||
if (test_bit(FLAG_DEFER_SETUP, &chan->flags)) {
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_PEND);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_AUTHOR_PEND);
|
||||
chan->ops->defer(chan);
|
||||
|
||||
} else {
|
||||
l2cap_state_change(chan, BT_CONFIG);
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
}
|
||||
} else {
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_PEND);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_AUTHEN_PEND);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_PEND);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_AUTHEN_PEND);
|
||||
}
|
||||
|
||||
l2cap_send_cmd(conn, chan->ident, L2CAP_CONN_RSP,
|
||||
|
|
@ -2895,9 +2895,9 @@ static struct sk_buff *l2cap_build_cmd(struct l2cap_conn *conn, u8 code,
|
|||
lh->len = cpu_to_le16(L2CAP_CMD_HDR_SIZE + dlen);
|
||||
|
||||
if (conn->hcon->type == LE_LINK)
|
||||
lh->cid = __constant_cpu_to_le16(L2CAP_CID_LE_SIGNALING);
|
||||
lh->cid = cpu_to_le16(L2CAP_CID_LE_SIGNALING);
|
||||
else
|
||||
lh->cid = __constant_cpu_to_le16(L2CAP_CID_SIGNALING);
|
||||
lh->cid = cpu_to_le16(L2CAP_CID_SIGNALING);
|
||||
|
||||
cmd = (struct l2cap_cmd_hdr *) skb_put(skb, L2CAP_CMD_HDR_SIZE);
|
||||
cmd->code = code;
|
||||
|
|
@ -3010,8 +3010,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 = __constant_cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);
|
||||
efs.flush_to = __constant_cpu_to_le32(L2CAP_EFS_DEFAULT_FLUSH_TO);
|
||||
efs.acc_lat = cpu_to_le32(L2CAP_DEFAULT_ACC_LAT);
|
||||
efs.flush_to = cpu_to_le32(L2CAP_EFS_DEFAULT_FLUSH_TO);
|
||||
break;
|
||||
|
||||
case L2CAP_MODE_STREAMING:
|
||||
|
|
@ -3152,8 +3152,8 @@ static void __l2cap_set_ertm_timeouts(struct l2cap_chan *chan,
|
|||
rfc->retrans_timeout = cpu_to_le16((u16) ertm_to);
|
||||
rfc->monitor_timeout = rfc->retrans_timeout;
|
||||
} else {
|
||||
rfc->retrans_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);
|
||||
rfc->monitor_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);
|
||||
rfc->retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO);
|
||||
rfc->monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3285,7 +3285,7 @@ done:
|
|||
}
|
||||
|
||||
req->dcid = cpu_to_le16(chan->dcid);
|
||||
req->flags = __constant_cpu_to_le16(0);
|
||||
req->flags = cpu_to_le16(0);
|
||||
|
||||
return ptr - data;
|
||||
}
|
||||
|
|
@ -3499,7 +3499,7 @@ done:
|
|||
}
|
||||
rsp->scid = cpu_to_le16(chan->dcid);
|
||||
rsp->result = cpu_to_le16(result);
|
||||
rsp->flags = __constant_cpu_to_le16(0);
|
||||
rsp->flags = cpu_to_le16(0);
|
||||
|
||||
return ptr - data;
|
||||
}
|
||||
|
|
@ -3608,7 +3608,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len,
|
|||
}
|
||||
|
||||
req->dcid = cpu_to_le16(chan->dcid);
|
||||
req->flags = __constant_cpu_to_le16(0);
|
||||
req->flags = cpu_to_le16(0);
|
||||
|
||||
return ptr - data;
|
||||
}
|
||||
|
|
@ -3639,7 +3639,7 @@ void __l2cap_le_connect_rsp_defer(struct l2cap_chan *chan)
|
|||
rsp.mtu = cpu_to_le16(chan->imtu);
|
||||
rsp.mps = cpu_to_le16(chan->mps);
|
||||
rsp.credits = cpu_to_le16(chan->rx_credits);
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
|
||||
l2cap_send_cmd(conn, chan->ident, L2CAP_LE_CONN_RSP, sizeof(rsp),
|
||||
&rsp);
|
||||
|
|
@ -3654,8 +3654,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 = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
|
||||
if (chan->hs_hcon)
|
||||
rsp_code = L2CAP_CREATE_CHAN_RSP;
|
||||
|
|
@ -3684,8 +3684,8 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
|
|||
u16 txwin_ext = chan->ack_win;
|
||||
struct l2cap_conf_rfc rfc = {
|
||||
.mode = chan->mode,
|
||||
.retrans_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO),
|
||||
.monitor_timeout = __constant_cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO),
|
||||
.retrans_timeout = cpu_to_le16(L2CAP_DEFAULT_RETRANS_TO),
|
||||
.monitor_timeout = cpu_to_le16(L2CAP_DEFAULT_MONITOR_TO),
|
||||
.max_pdu_size = cpu_to_le16(chan->imtu),
|
||||
.txwin_size = min_t(u16, chan->ack_win, L2CAP_DEFAULT_TX_WINDOW),
|
||||
};
|
||||
|
|
@ -3776,7 +3776,7 @@ static struct l2cap_chan *l2cap_connect(struct l2cap_conn *conn,
|
|||
l2cap_chan_lock(pchan);
|
||||
|
||||
/* Check if the ACL is secure enough (if not SDP) */
|
||||
if (psm != __constant_cpu_to_le16(L2CAP_PSM_SDP) &&
|
||||
if (psm != cpu_to_le16(L2CAP_PSM_SDP) &&
|
||||
!hci_conn_check_link_mode(conn->hcon)) {
|
||||
conn->disc_reason = HCI_ERROR_AUTH_FAILURE;
|
||||
result = L2CAP_CR_SEC_BLOCK;
|
||||
|
|
@ -3861,7 +3861,7 @@ sendresp:
|
|||
|
||||
if (result == L2CAP_CR_PEND && status == L2CAP_CS_NO_INFO) {
|
||||
struct l2cap_info_req info;
|
||||
info.type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
info.type = cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
|
||||
conn->info_state |= L2CAP_INFO_FEAT_MASK_REQ_SENT;
|
||||
conn->info_ident = l2cap_get_ident(conn);
|
||||
|
|
@ -4010,7 +4010,7 @@ static void cmd_reject_invalid_cid(struct l2cap_conn *conn, u8 ident,
|
|||
{
|
||||
struct l2cap_cmd_rej_cid rej;
|
||||
|
||||
rej.reason = __constant_cpu_to_le16(L2CAP_REJ_INVALID_CID);
|
||||
rej.reason = cpu_to_le16(L2CAP_REJ_INVALID_CID);
|
||||
rej.scid = __cpu_to_le16(scid);
|
||||
rej.dcid = __cpu_to_le16(dcid);
|
||||
|
||||
|
|
@ -4342,8 +4342,8 @@ static inline int l2cap_information_req(struct l2cap_conn *conn,
|
|||
u8 buf[8];
|
||||
u32 feat_mask = l2cap_feat_mask;
|
||||
struct l2cap_info_rsp *rsp = (struct l2cap_info_rsp *) buf;
|
||||
rsp->type = __constant_cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);
|
||||
rsp->type = cpu_to_le16(L2CAP_IT_FEAT_MASK);
|
||||
rsp->result = cpu_to_le16(L2CAP_IR_SUCCESS);
|
||||
if (!disable_ertm)
|
||||
feat_mask |= L2CAP_FEAT_ERTM | L2CAP_FEAT_STREAMING
|
||||
| L2CAP_FEAT_FCS;
|
||||
|
|
@ -4363,15 +4363,15 @@ static inline int l2cap_information_req(struct l2cap_conn *conn,
|
|||
else
|
||||
l2cap_fixed_chan[0] &= ~L2CAP_FC_A2MP;
|
||||
|
||||
rsp->type = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);
|
||||
rsp->result = __constant_cpu_to_le16(L2CAP_IR_SUCCESS);
|
||||
rsp->type = cpu_to_le16(L2CAP_IT_FIXED_CHAN);
|
||||
rsp->result = 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 = __constant_cpu_to_le16(L2CAP_IR_NOTSUPP);
|
||||
rsp.result = cpu_to_le16(L2CAP_IR_NOTSUPP);
|
||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_INFO_RSP, sizeof(rsp),
|
||||
&rsp);
|
||||
}
|
||||
|
|
@ -4416,7 +4416,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn,
|
|||
|
||||
if (conn->feat_mask & L2CAP_FEAT_FIXED_CHAN) {
|
||||
struct l2cap_info_req req;
|
||||
req.type = __constant_cpu_to_le16(L2CAP_IT_FIXED_CHAN);
|
||||
req.type = cpu_to_le16(L2CAP_IT_FIXED_CHAN);
|
||||
|
||||
conn->info_ident = l2cap_get_ident(conn);
|
||||
|
||||
|
|
@ -4510,8 +4510,8 @@ static int l2cap_create_channel_req(struct l2cap_conn *conn,
|
|||
error:
|
||||
rsp.dcid = 0;
|
||||
rsp.scid = cpu_to_le16(scid);
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_BAD_AMP);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_BAD_AMP);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
|
||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_CREATE_CHAN_RSP,
|
||||
sizeof(rsp), &rsp);
|
||||
|
|
@ -4575,7 +4575,7 @@ static void l2cap_send_move_chan_cfm_icid(struct l2cap_conn *conn, u16 icid)
|
|||
BT_DBG("conn %p, icid 0x%4.4x", conn, icid);
|
||||
|
||||
cfm.icid = cpu_to_le16(icid);
|
||||
cfm.result = __constant_cpu_to_le16(L2CAP_MC_UNCONFIRMED);
|
||||
cfm.result = cpu_to_le16(L2CAP_MC_UNCONFIRMED);
|
||||
|
||||
l2cap_send_cmd(conn, l2cap_get_ident(conn), L2CAP_MOVE_CHAN_CFM,
|
||||
sizeof(cfm), &cfm);
|
||||
|
|
@ -4758,12 +4758,12 @@ static void l2cap_do_create(struct l2cap_chan *chan, int result,
|
|||
|
||||
if (result == L2CAP_CR_SUCCESS) {
|
||||
/* Send successful response */
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_SUCCESS);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
} else {
|
||||
/* Send negative response */
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CR_NO_MEM);
|
||||
rsp.status = __constant_cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
rsp.result = cpu_to_le16(L2CAP_CR_NO_MEM);
|
||||
rsp.status = cpu_to_le16(L2CAP_CS_NO_INFO);
|
||||
}
|
||||
|
||||
l2cap_send_cmd(chan->conn, chan->ident, L2CAP_CREATE_CHAN_RSP,
|
||||
|
|
@ -4891,7 +4891,7 @@ static inline int l2cap_move_channel_req(struct l2cap_conn *conn,
|
|||
chan = l2cap_get_chan_by_dcid(conn, icid);
|
||||
if (!chan) {
|
||||
rsp.icid = cpu_to_le16(icid);
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_MR_NOT_ALLOWED);
|
||||
rsp.result = cpu_to_le16(L2CAP_MR_NOT_ALLOWED);
|
||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_MOVE_CHAN_RSP,
|
||||
sizeof(rsp), &rsp);
|
||||
return 0;
|
||||
|
|
@ -5235,9 +5235,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 = __constant_cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);
|
||||
rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_REJECTED);
|
||||
else
|
||||
rsp.result = __constant_cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);
|
||||
rsp.result = cpu_to_le16(L2CAP_CONN_PARAM_ACCEPTED);
|
||||
|
||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_CONN_PARAM_UPDATE_RSP,
|
||||
sizeof(rsp), &rsp);
|
||||
|
|
@ -5650,7 +5650,7 @@ static inline void l2cap_le_sig_channel(struct l2cap_conn *conn,
|
|||
|
||||
BT_ERR("Wrong link type (%d)", err);
|
||||
|
||||
rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
|
||||
rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
|
||||
l2cap_send_cmd(conn, cmd->ident, L2CAP_COMMAND_REJ,
|
||||
sizeof(rej), &rej);
|
||||
}
|
||||
|
|
@ -5695,7 +5695,7 @@ static inline void l2cap_sig_channel(struct l2cap_conn *conn,
|
|||
|
||||
BT_ERR("Wrong link type (%d)", err);
|
||||
|
||||
rej.reason = __constant_cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
|
||||
rej.reason = cpu_to_le16(L2CAP_REJ_NOT_UNDERSTOOD);
|
||||
l2cap_send_cmd(conn, cmd.ident, L2CAP_COMMAND_REJ,
|
||||
sizeof(rej), &rej);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ static int l2cap_sock_bind(struct socket *sock, struct sockaddr *addr, int alen)
|
|||
if (bdaddr_type_is_le(la.l2_bdaddr_type)) {
|
||||
/* We only allow ATT user space socket */
|
||||
if (la.l2_cid &&
|
||||
la.l2_cid != __constant_cpu_to_le16(L2CAP_CID_ATT))
|
||||
la.l2_cid != cpu_to_le16(L2CAP_CID_ATT))
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
@ -209,7 +209,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
|
|||
* ATT. Anything else is an invalid combination.
|
||||
*/
|
||||
if (chan->scid != L2CAP_CID_ATT ||
|
||||
la.l2_cid != __constant_cpu_to_le16(L2CAP_CID_ATT))
|
||||
la.l2_cid != cpu_to_le16(L2CAP_CID_ATT))
|
||||
return -EINVAL;
|
||||
|
||||
/* We don't have the hdev available here to make a
|
||||
|
|
@ -227,7 +227,7 @@ static int l2cap_sock_connect(struct socket *sock, struct sockaddr *addr,
|
|||
if (bdaddr_type_is_le(la.l2_bdaddr_type)) {
|
||||
/* We only allow ATT user space socket */
|
||||
if (la.l2_cid &&
|
||||
la.l2_cid != __constant_cpu_to_le16(L2CAP_CID_ATT))
|
||||
la.l2_cid != cpu_to_le16(L2CAP_CID_ATT))
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ static int cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
|
|||
|
||||
hdr = (void *) skb_put(skb, sizeof(*hdr));
|
||||
|
||||
hdr->opcode = __constant_cpu_to_le16(MGMT_EV_CMD_STATUS);
|
||||
hdr->opcode = cpu_to_le16(MGMT_EV_CMD_STATUS);
|
||||
hdr->index = cpu_to_le16(index);
|
||||
hdr->len = cpu_to_le16(sizeof(*ev));
|
||||
|
||||
|
|
@ -244,7 +244,7 @@ static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
|
|||
|
||||
hdr = (void *) skb_put(skb, sizeof(*hdr));
|
||||
|
||||
hdr->opcode = __constant_cpu_to_le16(MGMT_EV_CMD_COMPLETE);
|
||||
hdr->opcode = cpu_to_le16(MGMT_EV_CMD_COMPLETE);
|
||||
hdr->index = cpu_to_le16(index);
|
||||
hdr->len = cpu_to_le16(sizeof(*ev) + rp_len);
|
||||
|
||||
|
|
@ -270,7 +270,7 @@ static int read_version(struct sock *sk, struct hci_dev *hdev, void *data,
|
|||
BT_DBG("sock %p", sk);
|
||||
|
||||
rp.version = MGMT_VERSION;
|
||||
rp.revision = __constant_cpu_to_le16(MGMT_REVISION);
|
||||
rp.revision = cpu_to_le16(MGMT_REVISION);
|
||||
|
||||
return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0, &rp,
|
||||
sizeof(rp));
|
||||
|
|
@ -294,8 +294,8 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
|
|||
if (!rp)
|
||||
return -ENOMEM;
|
||||
|
||||
rp->num_commands = __constant_cpu_to_le16(num_commands);
|
||||
rp->num_events = __constant_cpu_to_le16(num_events);
|
||||
rp->num_commands = cpu_to_le16(num_commands);
|
||||
rp->num_events = cpu_to_le16(num_events);
|
||||
|
||||
for (i = 0, opcode = rp->opcodes; i < num_commands; i++, opcode++)
|
||||
put_unaligned_le16(mgmt_commands[i], opcode);
|
||||
|
|
@ -858,8 +858,8 @@ static void enable_advertising(struct hci_request *req)
|
|||
return;
|
||||
|
||||
memset(&cp, 0, sizeof(cp));
|
||||
cp.min_interval = __constant_cpu_to_le16(0x0800);
|
||||
cp.max_interval = __constant_cpu_to_le16(0x0800);
|
||||
cp.min_interval = cpu_to_le16(0x0800);
|
||||
cp.max_interval = cpu_to_le16(0x0800);
|
||||
cp.type = connectable ? LE_ADV_IND : LE_ADV_NONCONN_IND;
|
||||
cp.own_address_type = own_addr_type;
|
||||
cp.channel_map = hdev->le_adv_channel_map;
|
||||
|
|
@ -1181,7 +1181,7 @@ static int mgmt_event(u16 event, struct hci_dev *hdev, void *data, u16 data_len,
|
|||
if (hdev)
|
||||
hdr->index = cpu_to_le16(hdev->id);
|
||||
else
|
||||
hdr->index = __constant_cpu_to_le16(MGMT_INDEX_NONE);
|
||||
hdr->index = cpu_to_le16(MGMT_INDEX_NONE);
|
||||
hdr->len = cpu_to_le16(data_len);
|
||||
|
||||
if (data)
|
||||
|
|
@ -1493,15 +1493,15 @@ static void write_fast_connectable(struct hci_request *req, bool enable)
|
|||
type = PAGE_SCAN_TYPE_INTERLACED;
|
||||
|
||||
/* 160 msec page scan interval */
|
||||
acp.interval = __constant_cpu_to_le16(0x0100);
|
||||
acp.interval = cpu_to_le16(0x0100);
|
||||
} else {
|
||||
type = PAGE_SCAN_TYPE_STANDARD; /* default */
|
||||
|
||||
/* default 1.28 sec page scan */
|
||||
acp.interval = __constant_cpu_to_le16(0x0800);
|
||||
acp.interval = cpu_to_le16(0x0800);
|
||||
}
|
||||
|
||||
acp.window = __constant_cpu_to_le16(0x0012);
|
||||
acp.window = cpu_to_le16(0x0012);
|
||||
|
||||
if (__cpu_to_le16(hdev->page_scan_interval) != acp.interval ||
|
||||
__cpu_to_le16(hdev->page_scan_window) != acp.window)
|
||||
|
|
@ -5696,9 +5696,9 @@ void mgmt_device_found(struct hci_dev *hdev, bdaddr_t *bdaddr, u8 link_type,
|
|||
|
||||
ev->rssi = rssi;
|
||||
if (cfm_name)
|
||||
ev->flags |= __constant_cpu_to_le32(MGMT_DEV_FOUND_CONFIRM_NAME);
|
||||
ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_CONFIRM_NAME);
|
||||
if (!ssp)
|
||||
ev->flags |= __constant_cpu_to_le32(MGMT_DEV_FOUND_LEGACY_PAIRING);
|
||||
ev->flags |= cpu_to_le32(MGMT_DEV_FOUND_LEGACY_PAIRING);
|
||||
|
||||
if (eir_len > 0)
|
||||
memcpy(ev->eir, eir, eir_len);
|
||||
|
|
|
|||
|
|
@ -768,7 +768,7 @@ static struct rfcomm_session *rfcomm_session_create(bdaddr_t *src,
|
|||
|
||||
bacpy(&addr.l2_bdaddr, dst);
|
||||
addr.l2_family = AF_BLUETOOTH;
|
||||
addr.l2_psm = __constant_cpu_to_le16(RFCOMM_PSM);
|
||||
addr.l2_psm = cpu_to_le16(RFCOMM_PSM);
|
||||
addr.l2_cid = 0;
|
||||
addr.l2_bdaddr_type = BDADDR_BREDR;
|
||||
*err = kernel_connect(sock, (struct sockaddr *) &addr, sizeof(addr), O_NONBLOCK);
|
||||
|
|
@ -2032,7 +2032,7 @@ static int rfcomm_add_listener(bdaddr_t *ba)
|
|||
/* Bind socket */
|
||||
bacpy(&addr.l2_bdaddr, ba);
|
||||
addr.l2_family = AF_BLUETOOTH;
|
||||
addr.l2_psm = __constant_cpu_to_le16(RFCOMM_PSM);
|
||||
addr.l2_psm = cpu_to_le16(RFCOMM_PSM);
|
||||
addr.l2_cid = 0;
|
||||
addr.l2_bdaddr_type = BDADDR_BREDR;
|
||||
err = kernel_bind(sock, (struct sockaddr *) &addr, sizeof(addr));
|
||||
|
|
|
|||
|
|
@ -676,20 +676,20 @@ static void sco_conn_defer_accept(struct hci_conn *conn, u16 setting)
|
|||
bacpy(&cp.bdaddr, &conn->dst);
|
||||
cp.pkt_type = cpu_to_le16(conn->pkt_type);
|
||||
|
||||
cp.tx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = __constant_cpu_to_le32(0x00001f40);
|
||||
cp.tx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.rx_bandwidth = cpu_to_le32(0x00001f40);
|
||||
cp.content_format = cpu_to_le16(setting);
|
||||
|
||||
switch (setting & SCO_AIRMODE_MASK) {
|
||||
case SCO_AIRMODE_TRANSP:
|
||||
if (conn->pkt_type & ESCO_2EV3)
|
||||
cp.max_latency = __constant_cpu_to_le16(0x0008);
|
||||
cp.max_latency = cpu_to_le16(0x0008);
|
||||
else
|
||||
cp.max_latency = __constant_cpu_to_le16(0x000D);
|
||||
cp.max_latency = cpu_to_le16(0x000D);
|
||||
cp.retrans_effort = 0x02;
|
||||
break;
|
||||
case SCO_AIRMODE_CVSD:
|
||||
cp.max_latency = __constant_cpu_to_le16(0xffff);
|
||||
cp.max_latency = cpu_to_le16(0xffff);
|
||||
cp.retrans_effort = 0xff;
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,7 +218,7 @@ static struct sk_buff *smp_build_cmd(struct l2cap_conn *conn, u8 code,
|
|||
|
||||
lh = (struct l2cap_hdr *) skb_put(skb, L2CAP_HDR_SIZE);
|
||||
lh->len = cpu_to_le16(sizeof(code) + dlen);
|
||||
lh->cid = __constant_cpu_to_le16(L2CAP_CID_SMP);
|
||||
lh->cid = cpu_to_le16(L2CAP_CID_SMP);
|
||||
|
||||
memcpy(skb_put(skb, sizeof(code)), &code, sizeof(code));
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue