mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-12 13:34:10 +08:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
This commit is contained in:
commit
b4949b8456
@ -1197,9 +1197,7 @@ static int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
|
|||||||
iwl_print_hex_dump(trans, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len);
|
iwl_print_hex_dump(trans, IWL_DL_TX, (u8 *)tx_cmd->hdr, hdr_len);
|
||||||
|
|
||||||
/* Set up entry for this TFD in Tx byte-count array */
|
/* Set up entry for this TFD in Tx byte-count array */
|
||||||
if (is_agg)
|
iwl_trans_txq_update_byte_cnt_tbl(trans, txq, le16_to_cpu(tx_cmd->len));
|
||||||
iwl_trans_txq_update_byte_cnt_tbl(trans, txq,
|
|
||||||
le16_to_cpu(tx_cmd->len));
|
|
||||||
|
|
||||||
dma_sync_single_for_device(bus(trans)->dev, txcmd_phys, firstlen,
|
dma_sync_single_for_device(bus(trans)->dev, txcmd_phys, firstlen,
|
||||||
DMA_BIDIRECTIONAL);
|
DMA_BIDIRECTIONAL);
|
||||||
|
@ -673,7 +673,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
|
|||||||
goto encrypt;
|
goto encrypt;
|
||||||
|
|
||||||
auth:
|
auth:
|
||||||
if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
|
if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if (!hci_conn_auth(conn, sec_level, auth_type))
|
if (!hci_conn_auth(conn, sec_level, auth_type))
|
||||||
|
@ -2152,7 +2152,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voi
|
|||||||
void *ptr = req->data;
|
void *ptr = req->data;
|
||||||
int type, olen;
|
int type, olen;
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
struct l2cap_conf_rfc rfc;
|
struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC };
|
||||||
|
|
||||||
BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
|
BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data);
|
||||||
|
|
||||||
@ -2271,6 +2271,16 @@ static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Use sane default values in case a misbehaving remote device
|
||||||
|
* 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.max_pdu_size = cpu_to_le16(chan->imtu);
|
||||||
|
|
||||||
|
BT_ERR("Expected RFC option was not found, using defaults");
|
||||||
|
|
||||||
done:
|
done:
|
||||||
switch (rfc.mode) {
|
switch (rfc.mode) {
|
||||||
case L2CAP_MODE_ERTM:
|
case L2CAP_MODE_ERTM:
|
||||||
|
@ -1146,6 +1146,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
|
|||||||
if (list_empty(&s->dlcs)) {
|
if (list_empty(&s->dlcs)) {
|
||||||
s->state = BT_DISCONN;
|
s->state = BT_DISCONN;
|
||||||
rfcomm_send_disc(s, 0);
|
rfcomm_send_disc(s, 0);
|
||||||
|
rfcomm_session_clear_timer(s);
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
Loading…
Reference in New Issue
Block a user