| Message ID | 20101215155642.GE2377@tuxdriver.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: "John W. Linville" <linville@tuxdriver.com> Date: Wed, 15 Dec 2010 10:56:42 -0500 > This is a batch of fixes intended for 2.6.37. > > The biggest changes fix an issue where the iwlagn driver will misread > the EEPROM information for some devices that will soon be in the wild. > The initial impulse was to rewrite the EEPROM code, but I pushed back on > that for 2.6.37. The compromise is to add the new EEPROM reading code, > but only to invoke it for the new devices. Older devices will still use > the existing (and tested) EEPROM code. Note that all devices will use > the new code in 2.6.38 and beyond. > > This also includes a pull of bluetooth fixes from Gustavo Padovan. That > includes a null pointer fix and a fix for a regression that broke the > DUN profile -- say goodbye to your emergency cell-phone Internet > connection without that! > > Other patches include some device ID additions for p54usb, a fix to > avoid log spam resulting from suspend/resume with USB-based wireless > devices that don't define their own suspend hook, a null ptr fix for the > libertas driver, and another null pointer fix related to IBSS merges. > > Please let me know if there are problems! Looks good, pulled, thanks John. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Dave, This is a batch of fixes intended for 2.6.37. The biggest changes fix an issue where the iwlagn driver will misread the EEPROM information for some devices that will soon be in the wild. The initial impulse was to rewrite the EEPROM code, but I pushed back on that for 2.6.37. The compromise is to add the new EEPROM reading code, but only to invoke it for the new devices. Older devices will still use the existing (and tested) EEPROM code. Note that all devices will use the new code in 2.6.38 and beyond. This also includes a pull of bluetooth fixes from Gustavo Padovan. That includes a null pointer fix and a fix for a regression that broke the DUN profile -- say goodbye to your emergency cell-phone Internet connection without that! Other patches include some device ID additions for p54usb, a fix to avoid log spam resulting from suspend/resume with USB-based wireless devices that don't define their own suspend hook, a null ptr fix for the libertas driver, and another null pointer fix related to IBSS merges. Please let me know if there are problems! John --- The following changes since commit 2a27a03d3a891e87ca33d27a858b4db734a4cbab: pppoe.c: Fix kernel panic caused by __pppoe_xmit (2010-12-12 15:06:16 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master Christian Lamparter (1): p54usb: add 5 more USBIDs Eduardo Costa (1): p54usb: New USB ID for Gemtek WUBI-100GW Herton Ronaldo Krzesinski (1): mac80211: avoid calling ieee80211_work_work unconditionally Johan Hedberg (1): Bluetooth: Fix initial RFCOMM DLC security level Johannes Berg (1): iwlagn: rename enhanced txpower fields John W. Linville (1): Merge branch 'master' of git://git.kernel.org/.../padovan/bluetooth-2.6 Jun Nie (1): Bluetooth: add NULL pointer check in HCI Sven Neumann (1): libertas: fix potential NULL-pointer dereference Tim Harvey (1): mac80211: Fix NULL-pointer deference on ibss merge when not ready Wey-Yi Guy (1): iwlagn: implement layout-agnostic EEPROM reading drivers/bluetooth/hci_ldisc.c | 6 +- drivers/net/wireless/iwlwifi/iwl-1000.c | 2 + drivers/net/wireless/iwlwifi/iwl-6000.c | 12 ++++ drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c | 88 ++++++++++++++++++++++++- drivers/net/wireless/iwlwifi/iwl-agn-lib.c | 6 ++ drivers/net/wireless/iwlwifi/iwl-core.h | 1 + drivers/net/wireless/iwlwifi/iwl-eeprom.h | 25 ++++++- drivers/net/wireless/libertas/cfg.c | 2 +- drivers/net/wireless/p54/p54usb.c | 6 ++ net/bluetooth/rfcomm/core.c | 1 + net/mac80211/ibss.c | 4 + net/mac80211/work.c | 5 +- 12 files changed, 148 insertions(+), 10 deletions(-)