Merge branch 'master' of... (b4949b84) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -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);

		/* 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_BIDIRECTIONAL);

+1 −1

Original line number	Diff line number	Diff line
		@@ -673,7 +673,7 @@ int hci_conn_security(struct hci_conn *conn, __u8 sec_level, __u8 auth_type)
		goto encrypt;

		auth:
		if (test_and_set_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
		if (test_bit(HCI_CONN_ENCRYPT_PEND, &conn->pend))
		return 0;

		if (!hci_conn_auth(conn, sec_level, auth_type))

+11 −1

Original line number	Diff line number	Diff line
		@@ -2152,7 +2152,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan chan, void rsp, int len, voi
		void *ptr = req->data;
		int type, olen;
		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);

		@@ -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:
		switch (rfc.mode) {
		case L2CAP_MODE_ERTM:

+1 −0

Original line number	Diff line number	Diff line
		@@ -1146,6 +1146,7 @@ static int rfcomm_recv_ua(struct rfcomm_session *s, u8 dlci)
		if (list_empty(&s->dlcs)) {
		s->state = BT_DISCONN;
		rfcomm_send_disc(s, 0);
		rfcomm_session_clear_timer(s);
		}

		break;