pull request: wireless-2.6 2008-08-17
Subsystems (7)
Dave,
Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*...
I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML.
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit 23197916c447a1623d196e6547781180905f0bb2:
Matt Carlson (1):
tg3: Update version to 3.94
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Adrian Bunk (1):
ath9k: work around gcc ICEs (again)
Christian Lamparter (3):
p54: Fix regression due to commit b19fa1f
p54: move p54_vdcf_init to the right place.
p54u: reset skb's data/tail pointer on requeue
Henrique de Moraes Holschuh (1):
rfkill: protect suspended rfkill controllers
Holger Schurig (1):
ssb: allow compilation on systems without PCI
Huang Weiyi (1):
removed unused #include <version.h>
Jiri Slaby (1):
iwlwifi: fix printk newlines
Jochen Friedrich (1):
rt2x00: Fix txdone_entry_desc_flags
Larry Finger (2):
b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)
b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306
Luis R. Rodriguez (1):
mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE
Michael Karcher (1):
ath5k: Don't fiddle with MSI on suspend/resume.
Ron Rindjunsky (1):
mac80211: update new sta's rx timestamp
matthieu Barthélemy (1):
rtl8187: Add USB ID for Netgear WG111V3
Documentation/rfkill.txt | 5 +++ drivers/net/wireless/ath5k/base.c | 9 +---- drivers/net/wireless/ath9k/hw.c | 6 +++- drivers/net/wireless/b43/main.c | 3 +- drivers/net/wireless/ipw2100.c | 1 - drivers/net/wireless/ipw2200.c | 1 - drivers/net/wireless/iwlwifi/iwl-3945.c | 1 - drivers/net/wireless/iwlwifi/iwl-4965.c | 3 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 1 - drivers/net/wireless/iwlwifi/iwl-agn.c | 1 - drivers/net/wireless/iwlwifi/iwl-core.c | 1 - drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 ++-- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 - drivers/net/wireless/iwlwifi/iwl-power.c | 1 - drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++-- drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------ drivers/net/wireless/p54/p54common.h | 18 +++++----- drivers/net/wireless/p54/p54usb.c | 10 +++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++-- drivers/net/wireless/rt2x00/rt2x00usb.c | 1 + drivers/net/wireless/rtl8187_dev.c | 1 + drivers/ssb/main.c | 8 ++++ include/net/mac80211.h | 11 ++---- net/mac80211/mlme.c | 2 + net/rfkill/rfkill.c | 14 +++++-- 27 files changed, 100 insertions(+), 80 deletions(-)
Documentation/rfkill.txt +5 -0
@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, when possible) the overall transmitter rfkill state, not of a particular rfkill line. +5. During suspend, the rfkill class will attempt to soft-block the radio +through a call to rfkill->toggle_radio, and will try to restore its previous +state during resume. After a rfkill class is suspended, it will *not* call +rfkill->toggle_radio until it is resumed. + Example of a WLAN wireless driver connected to the rfkill subsystem: --------------------------------------------------------------------
drivers/net/wireless/ath5k/base.c +2 -7
@@ -40,7 +40,6 @@* */ -#include <linux/version.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/hardirq.h>
@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)ath5k_stop_hw (sc);free_irq (pdev->irq, sc); -pci_disable_msi (pdev);pci_save_state (pdev);pci_disable_device (pdev);pci_set_power_state (pdev, PCI_D3hot);
@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev)*/ pci_write_config_byte (pdev,0x41 ,0 ); -pci_enable_msi (pdev); - err =request_irq (pdev->irq, ath5k_intr,IRQF_SHARED ,"ath" , sc);if (err) {ATH5K_ERR (sc,"request_irq failed\n" ); - goto err_msi; + goto err_no_irq; } err =ath5k_init (sc);
@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev)return 0 ; err_irq:free_irq (pdev->irq, sc); -err_msi: -pci_disable_msi (pdev); +err_no_irq:pci_disable_device (pdev);return err; }
drivers/net/wireless/ath9k/hw.c +5 -1
@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,for (i =0 ; i <123 ; i++) {if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { -if ((abs (cur_vit_mask - bin)) <75 ) + +/* workaround for gcc bug #37014 */ +volatile int tmp =abs (cur_vit_mask - bin); + +if (tmp <75 ) mask_amt =1 ;else mask_amt =0 ;
drivers/net/wireless/b43/main.c +2 -1
@@ -33,7 +33,6 @@#include <linux/moduleparam.h> #include <linux/if_arp.h> #include <linux/etherdevice.h> -#include <linux/version.h> #include <linux/firmware.h> #include <linux/wireless.h> #include <linux/workqueue.h>
@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)if (bus->bustype ==SSB_BUSTYPE_PCI ) { pdev = bus->host_pci;if (IS_PDEV (pdev,BROADCOM ,0x4318 ,ASUSTEK ,0x100F ) || +IS_PDEV (pdev,BROADCOM ,0x4320 ,DELL ,0x0003 ) ||IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0015 ) || +IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0014 ) ||IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0013 )) bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST ; }
drivers/net/wireless/ipw2100.c +0 -1
@@ -157,7 +157,6 @@ that only one external action is invoked at a time.#include <linux/stringify.h> #include <linux/tcp.h> #include <linux/types.h> -#include <linux/version.h> #include <linux/time.h> #include <linux/firmware.h> #include <linux/acpi.h>
drivers/net/wireless/ipw2200.c +0 -1
@@ -31,7 +31,6 @@******************************************************************************/ #include "ipw2200.h" -#include <linux/version.h> #ifndef KBUILD_EXTMOD
drivers/net/wireless/iwlwifi/iwl-3945.c +0 -1
@@ -26,7 +26,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-4965.c +1 -2
@@ -26,7 +26,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, s =iwl4965_get_sub_band (priv, channel);if (s >=EEPROM_TX_POWER_BANDS ) { -IWL_ERROR ("Tx Power can not find channel %d " , channel); +IWL_ERROR ("Tx Power can not find channel %d\n" , channel);return -1 ; }
drivers/net/wireless/iwlwifi/iwl-5000.c +0 -1
@@ -25,7 +25,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-agn.c +0 -1
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-core.c +0 -1
@@ -28,7 +28,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> struct iwl_priv ;/* FIXME: remove */
drivers/net/wireless/iwlwifi/iwl-eeprom.c +3 -4
@@ -63,7 +63,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <net/mac80211.h>
@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) {u32 gp =iwl_read32 (priv,CSR_EEPROM_GP );if ((gp &CSR_EEPROM_GP_VALID_MSK ) ==CSR_EEPROM_GP_BAD_SIGNATURE ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp);return -ENOENT ; }return 0 ;
@@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) ret = priv->cfg->ops->lib->eeprom_ops.verify_signature (priv);if (ret <0 ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp); ret = -ENOENT ; goto err; }
@@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) }if (!(r &CSR_EEPROM_REG_READ_VALID_MSK )) { -IWL_ERROR ("Time out reading EEPROM[%d]" , addr); +IWL_ERROR ("Time out reading EEPROM[%d]\n" , addr); ret = -ETIMEDOUT ; goto done; }
drivers/net/wireless/iwlwifi/iwl-hcmd.c +0 -1
@@ -28,7 +28,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> #include "iwl-dev.h" /* FIXME: remove */
drivers/net/wireless/iwlwifi/iwl-power.c +0 -1
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <net/mac80211.h>
drivers/net/wireless/iwlwifi/iwl-sta.c +2 -2
@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,case WLAN_HT_CAP_MIMO_PS_DISABLED :break ;default : -IWL_WARNING ("Invalid MIMO PS mode %d" , mimo_ps_mode); +IWL_WARNING ("Invalid MIMO PS mode %d\n" , mimo_ps_mode);break ; }
@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)return priv->hw_params.bcast_sta_id;default : -IWL_WARNING ("Unknown mode of operation: %d" , priv->iw_mode); +IWL_WARNING ("Unknown mode of operation: %d\n" , priv->iw_mode);return priv->hw_params.bcast_sta_id; } }
drivers/net/wireless/iwlwifi/iwl-tx.c +2 -2
@@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)/* Alloc keep-warm buffer */ ret =iwl_kw_alloc (priv);if (ret) { -IWL_ERROR ("Keep Warm allocation failed" ); +IWL_ERROR ("Keep Warm allocation failed\n" ); goto error_kw; }spin_lock_irqsave (&priv->lock, flags);
@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,u16 ba_resp_scd_ssn =le16_to_cpu (ba_resp->scd_ssn);if (scd_flow >= priv->hw_params.max_txq_num) { -IWL_ERROR ("BUG_ON scd_flow is bigger than number of queues" ); +IWL_ERROR ("BUG_ON scd_flow is bigger than number of queues\n" );return ; }
drivers/net/wireless/iwlwifi/iwl3945-base.c +3 -4
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)BUILD_BUG_ON (sizeof (priv->eeprom) !=IWL_EEPROM_IMAGE_SIZE );if ((gp &CSR_EEPROM_GP_VALID_MSK ) ==CSR_EEPROM_GP_BAD_SIGNATURE ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp);return -ENOENT ; }
@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) }if (!(r &CSR_EEPROM_REG_READ_VALID_MSK )) { -IWL_ERROR ("Time out reading EEPROM[%d]" , addr); +IWL_ERROR ("Time out reading EEPROM[%d]\n" , addr);return -ETIMEDOUT ; } e[addr /2 ] =le16_to_cpu ((__force __le16)(r >>16 ));
@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *hreturn priv->hw_setting.bcast_sta_id;default : -IWL_WARNING ("Unknown mode of operation: %d" , priv->iw_mode); +IWL_WARNING ("Unknown mode of operation: %d\n" , priv->iw_mode);return priv->hw_setting.bcast_sta_id; } }
drivers/net/wireless/p54/p54common.c +27 -24
98 lines not on this page · raw message
drivers/net/wireless/p54/p54common.h +9 -9
@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {struct p54_tx_control_allocdata {u8 rateset[8 ]; -u16 padding; -u8 wep_key_present; -u8 wep_key_len; -u8 wep_key[16 ]; -__le32 frame_type; -u32 padding2; -__le16 magic4; -u8 antenna; +u8 unalloc0[2 ]; +u8 key_type; +u8 key_len; +u8 key[16 ]; +u8 hw_queue; +u8 unalloc1[9 ]; +u8 tx_antenna;u8 output_power; -__le32 magic5; +u8 cts_rate; +u8 unalloc2[3 ];u8 align[0 ]; } __attribute__ ((packed));
drivers/net/wireless/p54/p54usb.c +10 -0
@@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) urb->context = skb;skb_queue_tail (&priv->rx_queue, skb); }else { +if (!priv->hw_type) +skb_push (skb,sizeof (struct net2280_tx_hdr )); + +skb_reset_tail_pointer (skb);skb_trim (skb,0 ); +if (urb->transfer_buffer !=skb_tail_pointer (skb)) { +/* this should not happen */ +WARN_ON (1 ); + urb->transfer_buffer =skb_tail_pointer (skb); + } +skb_queue_tail (&priv->rx_queue, skb); }
drivers/net/wireless/rt2x00/rt2x00queue.h +4 -4
@@ -173,10 +173,10 @@ struct rxdone_entry_desc {* frame transmission failed due to excessive retries. */ enum txdone_entry_desc_flags { -TXDONE_UNKNOWN =1 <<0 , -TXDONE_SUCCESS =1 <<1 , -TXDONE_FAILURE =1 <<2 , -TXDONE_EXCESSIVE_RETRY =1 <<3 , +TXDONE_UNKNOWN , +TXDONE_SUCCESS , +TXDONE_FAILURE , +TXDONE_EXCESSIVE_RETRY , };/**
drivers/net/wireless/rt2x00/rt2x00usb.c +1 -0
@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)* (Only indirectly by looking at the failed TX counters * in the register). */ + txdesc.flags =0 ;if (!urb->status)__set_bit (TXDONE_UNKNOWN , &txdesc.flags);else
drivers/net/wireless/rtl8187_dev.c +1 -0
@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {/* Netgear */ {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, + {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B}, /* HP */ {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},/* Sitecom */
drivers/ssb/main.c +8 -0
@@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation);int ssb_dma_set_mask (struct ssb_device *dev,u64 mask) { +#ifdef CONFIG_SSB_PCIHOST int err; +#endif switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST err =pci_set_dma_mask (dev->bus->host_pci, mask);if (err)return err; err =pci_set_consistent_dma_mask (dev->bus->host_pci, mask);return err; +#endif case SSB_BUSTYPE_SSB :return dma_set_mask (dev->dev, mask);default :
@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, {switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST if (gfp_flags &GFP_DMA ) {/* Workaround: The PCI API does not support passing * a GFP flag. */
@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, size, dma_handle, gfp_flags); }return pci_alloc_consistent (dev->bus->host_pci, size, dma_handle); +#endif case SSB_BUSTYPE_SSB :return dma_alloc_coherent (dev->dev, size, dma_handle, gfp_flags);default :
@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, {switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST if (gfp_flags &GFP_DMA ) {/* Workaround: The PCI API does not support passing * a GFP flag. */
@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,pci_free_consistent (dev->bus->host_pci, size, vaddr, dma_handle);return ; +#endif case SSB_BUSTYPE_SSB :dma_free_coherent (dev->dev, size, vaddr, dma_handle);return ;
include/net/mac80211.h +3 -8
@@ -708,10 +708,7 @@ enum ieee80211_tkip_key_type {* rely on the host system for such buffering. This option is used * to configure the IEEE 802.11 upper layer to buffer broadcast and * multicast frames when there are power saving stations so that -* the driver can fetch them with ieee80211_get_buffered_bc(). Note -* that not setting this flag works properly only when the -* %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is also not set because -* otherwise the stack will not know when the DTIM beacon was sent. +* the driver can fetch them with ieee80211_get_buffered_bc(). * * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: * Hardware is not capable of short slot operation on the 2.4 GHz band.
@@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action {* See the section "Frame filtering" for more information. * This callback must be implemented and atomic. * -* @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon -* generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) -* mac80211 calls this function when a TIM bit must be set or cleared -* for a given AID. Must be atomic. +* @set_tim: Set TIM bit. mac80211 calls this function when a TIM bit +* must be set or cleared for a given AID. Must be atomic. * * @set_key: See the section "Hardware crypto acceleration" * This callback can sleep, and is only called between add_interface
net/mac80211/mlme.c +2 -0
@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,rcu_read_unlock ();return ; } +/* update new sta with its last rx activity */ + sta->last_rx = jiffies; }/*
net/rfkill/rfkill.c +10 -4
@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill)* calls and handling all the red tape such as issuing notifications * if the call is successful. * +* Suspended devices are not touched at all, and -EAGAIN is returned. +* * Note that the @force parameter cannot override a (possibly cached) * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of * RFKILL_STATE_HARD_BLOCKED implements either get_state() or
@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,int retval =0 ;enum rfkill_state oldstate, newstate; +if (unlikely (rfkill->dev.power.power_state.event &PM_EVENT_SLEEP )) +return -EBUSY ; + oldstate = rfkill->state; if (rfkill->get_state && !force &&
@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,* * This function toggles the state of all switches of given type, * unless a specific switch is claimed by userspace (in which case, -* that switch is left alone). +* that switch is left alone) or suspended. */ void rfkill_switch_all (enum rfkill_type type,enum rfkill_state state) {
@@ -239,8 +244,8 @@ EXPORT_SYMBOL(rfkill_switch_all);/** * rfkill_epo - emergency power off all transmitters * -* This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring -* everything in its path but rfkill_mutex and rfkill->mutex. +* This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED, +* ignoring everything in its path but rfkill_mutex and rfkill->mutex. */ void rfkill_epo (void ) {
@@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev)if (dev->power.power_state.event !=PM_EVENT_ON ) {mutex_lock (&rfkill->mutex); + dev->power.power_state.event =PM_EVENT_ON ; +/* restore radio state AND notify everybody */ rfkill_toggle_radio (rfkill, rfkill->state,1 );mutex_unlock (&rfkill->mutex); } - dev->power.power_state =PMSG_ON ; return 0; }#else
Signature · 6 lines
John W. Linville [email protected] -- 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
David Miller
maintainerFrom: "John W. Linville" <[email protected]>
Date: Sun, 17 Aug 2008 14:56:06 -0400
Quoted 7 lines
Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*...
I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML.
Two commits in here need a fixup.
Their commit messages reference SHA IDs but do not give a commit header line text reference as well.
p54: Fix regression due to commit b19fa1f
ath5k: Don't fiddle with MSI on suspend/resume.
Please fix this up and give me another pull request, thanks!
--
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
Larry Finger
Acked-byQuoted 4 lines · David Miller
Their commit messages reference SHA IDs but do not give a commit header line text reference as well.
p54: Fix regression due to commit b19fa1f
John,
This commit message should fix the above patch:
=============
From: Christian Lamparter <chunkeey-S0/[email protected]>
Commit b19fa1f, entitled "net: Delete NETDEVICES_MULTIQUEUE kconfig option" breaks p54pci and p54usb.
Additionally, the old logic always tx'ed cts frames (if enabled) with a short preamble when [rate > 3]. (i.e. with any 802.11g rate). Of course this isn't that bad, but it's still wrong!
---
Larry
--
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
ath5k text [Was: pull request: wireless-2.6 2008-08-17]
In reply to David MillerQuoted 4 lines · David Miller
Their commit messages reference SHA IDs but do not give a commit header line text reference as well.
ath5k: Don't fiddle with MSI on suspend/resume.
John, this is it (even if I don't understand the purpose):
ath5k: Don't fiddle with MSI on suspend/resume.
Commit 256b152b005e319f985f50f2a910a75ba0def74f (ath5k: don't enable MSI, we cannot handle it yet) has removed msi support, but overlooked the suspend/resume code. This patch completes msi removal.
I don't consider this patch copyrightable, and thus put it into the public domain. The result is of course a base.c file dual-licensed under 3-clause-BSD and GPL.
--
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
David Miller
maintainerRe: ath5k text
From: Jiri Slaby <[email protected]>
Date: Mon, 18 Aug 2008 09:00:34 +0200
Quoted 7 lines · David Miller
Quoted 4 lines
Their commit messages reference SHA IDs but do not give a commit header line text reference as well.
ath5k: Don't fiddle with MSI on suspend/resume.
John, this is it (even if I don't understand the purpose):
The purpose is that when patches are backported or moved to other GIT trees, the SHA ID is going to be different.
So when you reference just the SHA ID it is not enough infomration to universally find the commit you are referring to.
Do you understand "the purpose" now? :-)
--
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
pull request: wireless-2.6 2008-08-18
In reply to David MillerQuoted 9 lines · David Miller
Two commits in here need a fixup.
Their commit messages reference SHA IDs but do not give a commit header line text reference as well.
p54: Fix regression due to commit b19fa1f
ath5k: Don't fiddle with MSI on suspend/resume.Please fix this up and give me another pull request, thanks!
Dave,
(Revision 2, commit references in changelogs augmented w/ subject text.)
Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*...
I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML.
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-2.6/
---
The following changes since commit 23197916c447a1623d196e6547781180905f0bb2:
Matt Carlson (1):
tg3: Update version to 3.94
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6.git master
Adrian Bunk (1):
ath9k: work around gcc ICEs (again)
Christian Lamparter (3):
p54: Fix regression due to "net: Delete NETDEVICES_MULTIQUEUE kconfig option"
p54: move p54_vdcf_init to the right place.
p54u: reset skb's data/tail pointer on requeue
Henrique de Moraes Holschuh (1):
rfkill: protect suspended rfkill controllers
Holger Schurig (1):
ssb: allow compilation on systems without PCI
Huang Weiyi (1):
removed unused #include <version.h>
Jiri Slaby (1):
iwlwifi: fix printk newlines
Jochen Friedrich (1):
rt2x00: Fix txdone_entry_desc_flags
Larry Finger (2):
b43: Fix for SPROM coding error in Linksys WMP54G (BCM4306/3)
b43: Fix for another Bluetooth Coexistence SPROM Programming error for BCM4306
Luis R. Rodriguez (1):
mac80211: remove kdoc references to IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE
Michael Karcher (1):
ath5k: Don't fiddle with MSI on suspend/resume.
Ron Rindjunsky (1):
mac80211: update new sta's rx timestamp
matthieu Barthélemy (1):
rtl8187: Add USB ID for Netgear WG111V3
Documentation/rfkill.txt | 5 +++ drivers/net/wireless/ath5k/base.c | 9 +---- drivers/net/wireless/ath9k/hw.c | 6 +++- drivers/net/wireless/b43/main.c | 3 +- drivers/net/wireless/ipw2100.c | 1 - drivers/net/wireless/ipw2200.c | 1 - drivers/net/wireless/iwlwifi/iwl-3945.c | 1 - drivers/net/wireless/iwlwifi/iwl-4965.c | 3 +- drivers/net/wireless/iwlwifi/iwl-5000.c | 1 - drivers/net/wireless/iwlwifi/iwl-agn.c | 1 - drivers/net/wireless/iwlwifi/iwl-core.c | 1 - drivers/net/wireless/iwlwifi/iwl-eeprom.c | 7 ++-- drivers/net/wireless/iwlwifi/iwl-hcmd.c | 1 - drivers/net/wireless/iwlwifi/iwl-power.c | 1 - drivers/net/wireless/iwlwifi/iwl-sta.c | 4 +- drivers/net/wireless/iwlwifi/iwl-tx.c | 4 +- drivers/net/wireless/iwlwifi/iwl3945-base.c | 7 ++-- drivers/net/wireless/p54/p54common.c | 51 ++++++++++++++------------ drivers/net/wireless/p54/p54common.h | 18 +++++----- drivers/net/wireless/p54/p54usb.c | 10 +++++ drivers/net/wireless/rt2x00/rt2x00queue.h | 8 ++-- drivers/net/wireless/rt2x00/rt2x00usb.c | 1 + drivers/net/wireless/rtl8187_dev.c | 1 + drivers/ssb/main.c | 8 ++++ include/net/mac80211.h | 11 ++---- net/mac80211/mlme.c | 2 + net/rfkill/rfkill.c | 14 +++++-- 27 files changed, 100 insertions(+), 80 deletions(-)
Documentation/rfkill.txt +5 -0
@@ -363,6 +363,11 @@ This rule exists because users of the rfkill subsystem expect to get (and set, when possible) the overall transmitter rfkill state, not of a particular rfkill line. +5. During suspend, the rfkill class will attempt to soft-block the radio +through a call to rfkill->toggle_radio, and will try to restore its previous +state during resume. After a rfkill class is suspended, it will *not* call +rfkill->toggle_radio until it is resumed. + Example of a WLAN wireless driver connected to the rfkill subsystem: --------------------------------------------------------------------
drivers/net/wireless/ath5k/base.c +2 -7
@@ -40,7 +40,6 @@* */ -#include <linux/version.h> #include <linux/module.h> #include <linux/delay.h> #include <linux/hardirq.h>
@@ -587,7 +586,6 @@ ath5k_pci_suspend(struct pci_dev *pdev, pm_message_t state)ath5k_stop_hw (sc);free_irq (pdev->irq, sc); -pci_disable_msi (pdev);pci_save_state (pdev);pci_disable_device (pdev);pci_set_power_state (pdev, PCI_D3hot);
@@ -616,12 +614,10 @@ ath5k_pci_resume(struct pci_dev *pdev)*/ pci_write_config_byte (pdev,0x41 ,0 ); -pci_enable_msi (pdev); - err =request_irq (pdev->irq, ath5k_intr,IRQF_SHARED ,"ath" , sc);if (err) {ATH5K_ERR (sc,"request_irq failed\n" ); - goto err_msi; + goto err_no_irq; } err =ath5k_init (sc);
@@ -642,8 +638,7 @@ ath5k_pci_resume(struct pci_dev *pdev)return 0 ; err_irq:free_irq (pdev->irq, sc); -err_msi: -pci_disable_msi (pdev); +err_no_irq:pci_disable_device (pdev);return err; }
drivers/net/wireless/ath9k/hw.c +5 -1
@@ -5017,7 +5017,11 @@ static void ath9k_hw_spur_mitigate(struct ath_hal *ah,for (i =0 ; i <123 ; i++) {if ((cur_vit_mask > lower) && (cur_vit_mask < upper)) { -if ((abs (cur_vit_mask - bin)) <75 ) + +/* workaround for gcc bug #37014 */ +volatile int tmp =abs (cur_vit_mask - bin); + +if (tmp <75 ) mask_amt =1 ;else mask_amt =0 ;
drivers/net/wireless/b43/main.c +2 -1
@@ -33,7 +33,6 @@#include <linux/moduleparam.h> #include <linux/if_arp.h> #include <linux/etherdevice.h> -#include <linux/version.h> #include <linux/firmware.h> #include <linux/wireless.h> #include <linux/workqueue.h>
@@ -4615,7 +4614,9 @@ static void b43_sprom_fixup(struct ssb_bus *bus)if (bus->bustype ==SSB_BUSTYPE_PCI ) { pdev = bus->host_pci;if (IS_PDEV (pdev,BROADCOM ,0x4318 ,ASUSTEK ,0x100F ) || +IS_PDEV (pdev,BROADCOM ,0x4320 ,DELL ,0x0003 ) ||IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0015 ) || +IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0014 ) ||IS_PDEV (pdev,BROADCOM ,0x4320 ,LINKSYS ,0x0013 )) bus->sprom.boardflags_lo &= ~B43_BFL_BTCOEXIST ; }
drivers/net/wireless/ipw2100.c +0 -1
@@ -157,7 +157,6 @@ that only one external action is invoked at a time.#include <linux/stringify.h> #include <linux/tcp.h> #include <linux/types.h> -#include <linux/version.h> #include <linux/time.h> #include <linux/firmware.h> #include <linux/acpi.h>
drivers/net/wireless/ipw2200.c +0 -1
@@ -31,7 +31,6 @@******************************************************************************/ #include "ipw2200.h" -#include <linux/version.h> #ifndef KBUILD_EXTMOD
drivers/net/wireless/iwlwifi/iwl-3945.c +0 -1
@@ -26,7 +26,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-4965.c +1 -2
@@ -26,7 +26,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
@@ -967,7 +966,7 @@ static int iwl4965_interpolate_chan(struct iwl_priv *priv, u32 channel, s =iwl4965_get_sub_band (priv, channel);if (s >=EEPROM_TX_POWER_BANDS ) { -IWL_ERROR ("Tx Power can not find channel %d " , channel); +IWL_ERROR ("Tx Power can not find channel %d\n" , channel);return -1 ; }
drivers/net/wireless/iwlwifi/iwl-5000.c +0 -1
@@ -25,7 +25,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-agn.c +0 -1
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
drivers/net/wireless/iwlwifi/iwl-core.c +0 -1
@@ -28,7 +28,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> struct iwl_priv ;/* FIXME: remove */
drivers/net/wireless/iwlwifi/iwl-eeprom.c +3 -4
@@ -63,7 +63,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <net/mac80211.h>
@@ -146,7 +145,7 @@ int iwlcore_eeprom_verify_signature(struct iwl_priv *priv) {u32 gp =iwl_read32 (priv,CSR_EEPROM_GP );if ((gp &CSR_EEPROM_GP_VALID_MSK ) ==CSR_EEPROM_GP_BAD_SIGNATURE ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp);return -ENOENT ; }return 0 ;
@@ -227,7 +226,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) ret = priv->cfg->ops->lib->eeprom_ops.verify_signature (priv);if (ret <0 ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp); ret = -ENOENT ; goto err; }
@@ -254,7 +253,7 @@ int iwl_eeprom_init(struct iwl_priv *priv) }if (!(r &CSR_EEPROM_REG_READ_VALID_MSK )) { -IWL_ERROR ("Time out reading EEPROM[%d]" , addr); +IWL_ERROR ("Time out reading EEPROM[%d]\n" , addr); ret = -ETIMEDOUT ; goto done; }
drivers/net/wireless/iwlwifi/iwl-hcmd.c +0 -1
@@ -28,7 +28,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <net/mac80211.h> #include "iwl-dev.h" /* FIXME: remove */
drivers/net/wireless/iwlwifi/iwl-power.c +0 -1
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <net/mac80211.h>
drivers/net/wireless/iwlwifi/iwl-sta.c +2 -2
@@ -207,7 +207,7 @@ static void iwl_set_ht_add_station(struct iwl_priv *priv, u8 index,case WLAN_HT_CAP_MIMO_PS_DISABLED :break ;default : -IWL_WARNING ("Invalid MIMO PS mode %d" , mimo_ps_mode); +IWL_WARNING ("Invalid MIMO PS mode %d\n" , mimo_ps_mode);break ; }
@@ -969,7 +969,7 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)return priv->hw_params.bcast_sta_id;default : -IWL_WARNING ("Unknown mode of operation: %d" , priv->iw_mode); +IWL_WARNING ("Unknown mode of operation: %d\n" , priv->iw_mode);return priv->hw_params.bcast_sta_id; } }
drivers/net/wireless/iwlwifi/iwl-tx.c +2 -2
@@ -493,7 +493,7 @@ int iwl_txq_ctx_reset(struct iwl_priv *priv)/* Alloc keep-warm buffer */ ret =iwl_kw_alloc (priv);if (ret) { -IWL_ERROR ("Keep Warm allocation failed" ); +IWL_ERROR ("Keep Warm allocation failed\n" ); goto error_kw; }spin_lock_irqsave (&priv->lock, flags);
@@ -1463,7 +1463,7 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,u16 ba_resp_scd_ssn =le16_to_cpu (ba_resp->scd_ssn);if (scd_flow >= priv->hw_params.max_txq_num) { -IWL_ERROR ("BUG_ON scd_flow is bigger than number of queues" ); +IWL_ERROR ("BUG_ON scd_flow is bigger than number of queues\n" );return ; }
drivers/net/wireless/iwlwifi/iwl3945-base.c +3 -4
@@ -29,7 +29,6 @@#include <linux/kernel.h> #include <linux/module.h> -#include <linux/version.h> #include <linux/init.h> #include <linux/pci.h> #include <linux/dma-mapping.h>
@@ -1558,7 +1557,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)BUILD_BUG_ON (sizeof (priv->eeprom) !=IWL_EEPROM_IMAGE_SIZE );if ((gp &CSR_EEPROM_GP_VALID_MSK ) ==CSR_EEPROM_GP_BAD_SIGNATURE ) { -IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x" , gp); +IWL_ERROR ("EEPROM not found, EEPROM_GP=0x%08x\n" , gp);return -ENOENT ; }
@@ -1583,7 +1582,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) }if (!(r &CSR_EEPROM_REG_READ_VALID_MSK )) { -IWL_ERROR ("Time out reading EEPROM[%d]" , addr); +IWL_ERROR ("Time out reading EEPROM[%d]\n" , addr);return -ETIMEDOUT ; } e[addr /2 ] =le16_to_cpu ((__force __le16)(r >>16 ));
@@ -2507,7 +2506,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *hreturn priv->hw_setting.bcast_sta_id;default : -IWL_WARNING ("Unknown mode of operation: %d" , priv->iw_mode); +IWL_WARNING ("Unknown mode of operation: %d\n" , priv->iw_mode);return priv->hw_setting.bcast_sta_id; } }
drivers/net/wireless/p54/p54common.c +27 -24
98 lines not on this page · raw message
drivers/net/wireless/p54/p54common.h +9 -9
@@ -183,16 +183,16 @@ struct p54_frame_sent_hdr {struct p54_tx_control_allocdata {u8 rateset[8 ]; -u16 padding; -u8 wep_key_present; -u8 wep_key_len; -u8 wep_key[16 ]; -__le32 frame_type; -u32 padding2; -__le16 magic4; -u8 antenna; +u8 unalloc0[2 ]; +u8 key_type; +u8 key_len; +u8 key[16 ]; +u8 hw_queue; +u8 unalloc1[9 ]; +u8 tx_antenna;u8 output_power; -__le32 magic5; +u8 cts_rate; +u8 unalloc2[3 ];u8 align[0 ]; } __attribute__ ((packed));
drivers/net/wireless/p54/p54usb.c +10 -0
@@ -109,7 +109,17 @@ static void p54u_rx_cb(struct urb *urb) urb->context = skb;skb_queue_tail (&priv->rx_queue, skb); }else { +if (!priv->hw_type) +skb_push (skb,sizeof (struct net2280_tx_hdr )); + +skb_reset_tail_pointer (skb);skb_trim (skb,0 ); +if (urb->transfer_buffer !=skb_tail_pointer (skb)) { +/* this should not happen */ +WARN_ON (1 ); + urb->transfer_buffer =skb_tail_pointer (skb); + } +skb_queue_tail (&priv->rx_queue, skb); }
drivers/net/wireless/rt2x00/rt2x00queue.h +4 -4
@@ -173,10 +173,10 @@ struct rxdone_entry_desc {* frame transmission failed due to excessive retries. */ enum txdone_entry_desc_flags { -TXDONE_UNKNOWN =1 <<0 , -TXDONE_SUCCESS =1 <<1 , -TXDONE_FAILURE =1 <<2 , -TXDONE_EXCESSIVE_RETRY =1 <<3 , +TXDONE_UNKNOWN , +TXDONE_SUCCESS , +TXDONE_FAILURE , +TXDONE_EXCESSIVE_RETRY , };/**
drivers/net/wireless/rt2x00/rt2x00usb.c +1 -0
@@ -181,6 +181,7 @@ static void rt2x00usb_interrupt_txdone(struct urb *urb)* (Only indirectly by looking at the failed TX counters * in the register). */ + txdesc.flags =0 ;if (!urb->status)__set_bit (TXDONE_UNKNOWN , &txdesc.flags);else
drivers/net/wireless/rtl8187_dev.c +1 -0
@@ -40,6 +40,7 @@ static struct usb_device_id rtl8187_table[] __devinitdata = {/* Netgear */ {USB_DEVICE(0x0846, 0x6100), .driver_info = DEVICE_RTL8187}, {USB_DEVICE(0x0846, 0x6a00), .driver_info = DEVICE_RTL8187}, + {USB_DEVICE(0x0846, 0x4260), .driver_info = DEVICE_RTL8187B}, /* HP */ {USB_DEVICE(0x03f0, 0xca02), .driver_info = DEVICE_RTL8187},/* Sitecom */
drivers/ssb/main.c +8 -0
@@ -1165,15 +1165,19 @@ EXPORT_SYMBOL(ssb_dma_translation);int ssb_dma_set_mask (struct ssb_device *dev,u64 mask) { +#ifdef CONFIG_SSB_PCIHOST int err; +#endif switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST err =pci_set_dma_mask (dev->bus->host_pci, mask);if (err)return err; err =pci_set_consistent_dma_mask (dev->bus->host_pci, mask);return err; +#endif case SSB_BUSTYPE_SSB :return dma_set_mask (dev->dev, mask);default :
@@ -1188,6 +1192,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, {switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST if (gfp_flags &GFP_DMA ) {/* Workaround: The PCI API does not support passing * a GFP flag. */
@@ -1195,6 +1200,7 @@ void * ssb_dma_alloc_consistent(struct ssb_device *dev, size_t size, size, dma_handle, gfp_flags); }return pci_alloc_consistent (dev->bus->host_pci, size, dma_handle); +#endif case SSB_BUSTYPE_SSB :return dma_alloc_coherent (dev->dev, size, dma_handle, gfp_flags);default :
@@ -1210,6 +1216,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size, {switch (dev->bus->bustype) {case SSB_BUSTYPE_PCI : +#ifdef CONFIG_SSB_PCIHOST if (gfp_flags &GFP_DMA ) {/* Workaround: The PCI API does not support passing * a GFP flag. */
@@ -1220,6 +1227,7 @@ void ssb_dma_free_consistent(struct ssb_device *dev, size_t size,pci_free_consistent (dev->bus->host_pci, size, vaddr, dma_handle);return ; +#endif case SSB_BUSTYPE_SSB :dma_free_coherent (dev->dev, size, vaddr, dma_handle);return ;
include/net/mac80211.h +3 -8
@@ -708,10 +708,7 @@ enum ieee80211_tkip_key_type {* rely on the host system for such buffering. This option is used * to configure the IEEE 802.11 upper layer to buffer broadcast and * multicast frames when there are power saving stations so that -* the driver can fetch them with ieee80211_get_buffered_bc(). Note -* that not setting this flag works properly only when the -* %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is also not set because -* otherwise the stack will not know when the DTIM beacon was sent. +* the driver can fetch them with ieee80211_get_buffered_bc(). * * @IEEE80211_HW_2GHZ_SHORT_SLOT_INCAPABLE: * Hardware is not capable of short slot operation on the 2.4 GHz band.
@@ -1099,10 +1096,8 @@ enum ieee80211_ampdu_mlme_action {* See the section "Frame filtering" for more information. * This callback must be implemented and atomic. * -* @set_tim: Set TIM bit. If the hardware/firmware takes care of beacon -* generation (that is, %IEEE80211_HW_HOST_GEN_BEACON_TEMPLATE is set) -* mac80211 calls this function when a TIM bit must be set or cleared -* for a given AID. Must be atomic. +* @set_tim: Set TIM bit. mac80211 calls this function when a TIM bit +* must be set or cleared for a given AID. Must be atomic. * * @set_key: See the section "Hardware crypto acceleration" * This callback can sleep, and is only called between add_interface
net/mac80211/mlme.c +2 -0
@@ -2103,6 +2103,8 @@ static void ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,rcu_read_unlock ();return ; } +/* update new sta with its last rx activity */ + sta->last_rx = jiffies; }/*
net/rfkill/rfkill.c +10 -4
@@ -150,6 +150,8 @@ static void update_rfkill_state(struct rfkill *rfkill)* calls and handling all the red tape such as issuing notifications * if the call is successful. * +* Suspended devices are not touched at all, and -EAGAIN is returned. +* * Note that the @force parameter cannot override a (possibly cached) * state of RFKILL_STATE_HARD_BLOCKED. Any device making use of * RFKILL_STATE_HARD_BLOCKED implements either get_state() or
@@ -168,6 +170,9 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,int retval =0 ;enum rfkill_state oldstate, newstate; +if (unlikely (rfkill->dev.power.power_state.event &PM_EVENT_SLEEP )) +return -EBUSY ; + oldstate = rfkill->state; if (rfkill->get_state && !force &&
@@ -214,7 +219,7 @@ static int rfkill_toggle_radio(struct rfkill *rfkill,* * This function toggles the state of all switches of given type, * unless a specific switch is claimed by userspace (in which case, -* that switch is left alone). +* that switch is left alone) or suspended. */ void rfkill_switch_all (enum rfkill_type type,enum rfkill_state state) {
@@ -239,8 +244,8 @@ EXPORT_SYMBOL(rfkill_switch_all);/** * rfkill_epo - emergency power off all transmitters * -* This kicks all rfkill devices to RFKILL_STATE_SOFT_BLOCKED, ignoring -* everything in its path but rfkill_mutex and rfkill->mutex. +* This kicks all non-suspended rfkill devices to RFKILL_STATE_SOFT_BLOCKED, +* ignoring everything in its path but rfkill_mutex and rfkill->mutex. */ void rfkill_epo (void ) {
@@ -458,13 +463,14 @@ static int rfkill_resume(struct device *dev)if (dev->power.power_state.event !=PM_EVENT_ON ) {mutex_lock (&rfkill->mutex); + dev->power.power_state.event =PM_EVENT_ON ; +/* restore radio state AND notify everybody */ rfkill_toggle_radio (rfkill, rfkill->state,1 );mutex_unlock (&rfkill->mutex); } - dev->power.power_state =PMSG_ON ; return 0; }#else
Signature · 6 lines
John W. Linville [email protected] -- 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
David Miller
maintainerRe: pull request: wireless-2.6 2008-08-18
From: "John W. Linville" <[email protected]>
Date: Mon, 18 Aug 2008 11:15:51 -0400
Quoted 9 lines
(Revision 2, commit references in changelogs augmented w/ subject text.)
Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*...
I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML.
Pulled thanks John.
Assuming nothing shows up in my build testing I'll push this out to kernel.org shortly.
Thanks again!
Re: pull request: wireless-2.6 2008-08-18
Hi Dave,
Quoted 11 lines · On Mon, 18 Aug 2008 21:16:32 -0700 (PDT) David Miller <[email protected]>…
From: "John W. Linville" <[email protected]>
Date: Mon, 18 Aug 2008 11:15:51 -0400Quoted 7 lines
(Revision 2, commit references in changelogs augmented w/ subject text.)
Here is the latest round of wireless fixes for 2.6.27. The silliest one is the one from Adrian Bunk, which applies the gcc-related fix to ath9k again because there were two identical pieces of code to fix -- I guess I didn't get the joke *facepalm*...
Quoted 7 lines
Quoted 2 lines
I don't think there is anything else remarkable, although I think we fix a couple of the current regressions on LKML.
Pulled thanks John.
Assuming nothing shows up in my build testing I'll push this out to kernel.org shortly.
Just as an extra datapoint, this has already merged into linux-next and built fine for a powerpc ppc64_defconfig and x86_64 allmodconfig this morning. And yesterday's linux-next had the previous version of these patches (only commit comment differences as far as I am aware) and the build logs are at http://kisskb.ellerman.id.au/linux-next .
Signature · 3 lines
Cheers, Stephen Rothwell [email protected] http://www.canb.auug.org.au/~sfr/
David Miller
maintainerRe: pull request: wireless-2.6 2008-08-18
From: Stephen Rothwell <[email protected]>
Date: Tue, 19 Aug 2008 14:27:39 +1000
Quoted 5 lines
Just as an extra datapoint, this has already merged into linux-next and built fine for a powerpc
ppc64_defconfigandx86_64allmodconfig this morning. And yesterday's linux-next had the previous version of these patches (only commit comment differences as far as I am aware) and the build logs are at http://kisskb.ellerman.id.au/linux-next .
Thanks Stephen, they just passed my sparc64 allmodconfig builds too :-)
--
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