pull request: wireless 2011-12-21
Subsystems (4)
commit b4949b84567f3ae1227d076fc95bbd8efea06506
Dave,
A few last(?) fixes intended for 3.2...
The biggest portion are from Gustavo:
"3 fixes for 3.2! There one revert that was causing connection issues, a RFCOMM fix to a potential kernel panic, and the last on L2CAP to a possible access to uninitialized data due to broken remote devices."
Also, an iwlwifi fix for a problem causing firmware asserts.
Please let me know if there are problems!
John
---
The following changes since commit cd7816d14953c8af910af5bb92f488b0b277e29d:
net: have ipconfig not wait if no dev is available (2011-12-20 14:09:15 -0500)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless.git for-davem
Emmanuel Grumbach (1):
iwlwifi: update SCD BC table for all SCD queues
Gustavo F. Padovan (1):
Revert "Bluetooth: Revert: Fix L2CAP connection establishment"
John W. Linville (2):
Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth
Merge branch 'master' of git://git.kernel.org/.../linville/wireless into for-davem
Mat Martineau (2):
Bluetooth: Prevent uninitialized data access in L2CAP configuration
Bluetooth: Clear RFCOMM session timer when disconnecting last channel
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 4 +--- net/bluetooth/hci_conn.c | 2 +- net/bluetooth/l2cap_core.c | 12 +++++++++++- net/bluetooth/rfcomm/core.c | 1 + 4 files changed, 14 insertions(+), 5 deletions(-)
drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +1 -3
@@ -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 );
net/bluetooth/hci_conn.c +1 -1
@@ -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))
net/bluetooth/l2cap_core.c +11 -1
@@ -2152,7 +2152,7 @@ static int l2cap_parse_conf_rsp(struct l2cap_chan *chan, void *rsp, int len, voivoid *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 :
net/bluetooth/rfcomm/core.c +1 -0
@@ -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 ;
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Wed, 21 Dec 2011 13:59:14 -0500
Quoted 11 lines
A few last(?) fixes intended for 3.2...
The biggest portion are from Gustavo:
"3 fixes for 3.2! There one revert that was causing connection issues, a RFCOMM fix to a potential kernel panic, and the last on L2CAP to a possible access to uninitialized data due to broken remote devices."
Also, an iwlwifi fix for a problem causing firmware asserts.
Please let me know if there are problems!
Pulled, thanks John.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html