pull request: wireless-next-2.6 2009-06-15
Subsystems (9)
Dave,
This is a batch of (mostly) fixes instended for 2.6.31. Most of them are fixes, many with references to bug reports. Most of the rest is fall-out and stragglers related to the rfkill rework. There is also the addition of a debugfs file to aid debugging.
Please let me know if there are problems!
Thanks,
John
---
Individual patches are available here:
http://www.kernel.org/pub/linux/kernel/people/linville/wireless-next-2.6/
---
The following changes since commit 9cbc1cb8cd46ce1f7645b9de249b2ce8460129bb:
David S. Miller (1):
Merge branch 'master' of master.kernel.org:/.../torvalds/linux-2.6
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6.git master
Abhijeet Kolekar (1):
iwlwifi/iwl3945: fix suspend resume association bug
Andrey Yurovsky (1):
libertas: fix IEEE PS mode in GSPI driver
Gabor Juhos (3):
ath9k: restore power mode on error path
ath9k: prevent sleeping while we are waiting for CAB
ath9k: process rx packet if we are waiting for CAB
Johannes Berg (8):
sony: fix rfkill code again
iwlwifi: revamp bss_info_changed
ath9k: port to cfg80211 rfkill
mac80211: add queue debugfs file
mac80211: disconnect when user changes channel
rfkill: improve docs
dell-laptop: fix rfkill conversion
mac80211: fix wext bssid/ssid setting
Jouni Malinen (1):
mac80211: Do not try to associate with an empty SSID
Nick Kossifidis (1):
ath5k: fix mesh beaconing
Sebastian Andrzej Siewior (1):
net/libertas: don't recursive spin lock in if_spi_e2h()
Vasanthakumar Thiagarajan (2):
ath9k: Add helper to get ath9k specific current channel
ath9k: Make sure we have current channel in ah_curchan before rf disable/enable
Wey-Yi Guy (3):
iwlwifi: checking for 40MHz mode
iwlwifi: check control channel for pure 40MHz
iwlwifi: check for channel location for 40MHz
Documentation/rfkill.txt | 137 +++++++++++++------------- drivers/net/wireless/ath/ath5k/pcu.c | 5 +- drivers/net/wireless/ath/ath9k/Kconfig | 1 - drivers/net/wireless/ath/ath9k/ath9k.h | 10 +-- drivers/net/wireless/ath/ath9k/hw.c | 29 +++--- drivers/net/wireless/ath/ath9k/hw.h | 3 - drivers/net/wireless/ath/ath9k/main.c | 130 ++++++++----------------- drivers/net/wireless/ath/ath9k/recv.c | 1 + drivers/net/wireless/iwlwifi/iwl-agn.c | 1 - drivers/net/wireless/iwlwifi/iwl-core.c | 141 ++++++++++++++++----------- drivers/net/wireless/iwlwifi/iwl3945-base.c | 4 +- drivers/net/wireless/libertas/if_spi.c | 11 +- drivers/platform/x86/dell-laptop.c | 2 +- drivers/platform/x86/sony-laptop.c | 5 +- net/mac80211/debugfs.c | 25 +++++ net/mac80211/ieee80211_i.h | 2 +- net/mac80211/mlme.c | 38 +++++--- net/mac80211/util.c | 25 ----- net/mac80211/wext.c | 31 +++++- 19 files changed, 304 insertions(+), 297 deletions(-)
Documentation/rfkill.txt +69 -68
@@ -3,9 +3,8 @@ rfkill - RF kill switch support 1. Introduction 2. Implementation details -3. Kernel driver guidelines -4. Kernel API -5. Userspace support +3. Kernel API +4. Userspace support 1. Introduction
@@ -19,82 +18,62 @@ disable all transmitters of a certain type (or all). This is intended for situations where transmitters need to be turned off, for example on aircraft. +The rfkill subsystem has a concept of "hard" and "soft" block, which +differ little in their meaning (block == transmitters off) but rather in +whether they can be changed or not: + - hard block: read-only radio block that cannot be overriden by software + - soft block: writable radio block (need not be readable) that is set by + the system software. 2. Implementation details -The rfkill subsystem is composed of various components: the rfkill class, the -rfkill-input module (an input layer handler), and some specific input layer -events. - -The rfkill class is provided for kernel drivers to register their radio -transmitter with the kernel, provide methods for turning it on and off and, -optionally, letting the system know about hardware-disabled states that may -be implemented on the device. This code is enabled with the CONFIG_RFKILL -Kconfig option, which drivers can "select". - -The rfkill class code also notifies userspace of state changes, this is -achieved via uevents. It also provides some sysfs files for userspace to -check the status of radio transmitters. See the "Userspace support" section -below. +The rfkill subsystem is composed of three main components: + * the rfkill core, + * the deprecated rfkill-input module (an input layer handler, being + replaced by userspace policy code) and + * the rfkill drivers. +The rfkill core provides API for kernel drivers to register their radio +transmitter with the kernel, methods for turning it on and off and, letting +the system know about hardware-disabled states that may be implemented on +the device. -The rfkill-input code implements a basic response to rfkill buttons -- it -implements turning on/off all devices of a certain class (or all). +The rfkill core code also notifies userspace of state changes, and provides +ways for userspace to query the current states. See the "Userspace support" +section below. When the device is hard-blocked (either by a call to rfkill_set_hw_state() -or from query_hw_block) set_block() will be invoked but drivers can well -ignore the method call since they can use the return value of the function -rfkill_set_hw_state() to sync the software state instead of keeping track -of calls to set_block(). - - -The entire functionality is spread over more than one subsystem: - - * The kernel input layer generates KEY_WWAN, KEY_WLAN etc. and - SW_RFKILL_ALL -- when the user presses a button. Drivers for radio - transmitters generally do not register to the input layer, unless the - device really provides an input device (i.e. a button that has no - effect other than generating a button press event) - - * The rfkill-input code hooks up to these events and switches the soft-block - of the various radio transmitters, depending on the button type. - - * The rfkill drivers turn off/on their transmitters as requested. - - * The rfkill class will generate userspace notifications (uevents) to tell - userspace what the current state is. +or from query_hw_block) set_block() will be invoked for additional software +block, but drivers can ignore the method call since they can use the return +value of the function rfkill_set_hw_state() to sync the software state +instead of keeping track of calls to set_block(). In fact, drivers should +use the return value of rfkill_set_hw_state() unless the hardware actually +keeps track of soft and hard block separately. +3. Kernel API -3. Kernel driver guidelines - -Drivers for radio transmitters normally implement only the rfkill class. -These drivers may not unblock the transmitter based on own decisions, they -should act on information provided by the rfkill class only. +Drivers for radio transmitters normally implement an rfkill driver. Platform drivers might implement input devices if the rfkill button is just that, a button. If that button influences the hardware then you need to -implement an rfkill class instead. This also applies if the platform provides +implement an rfkill driver instead. This also applies if the platform provides a way to turn on/off the transmitter(s). -During suspend/hibernation, transmitters should only be left enabled when -wake-on wlan or similar functionality requires it and the device wasn't -blocked before suspend/hibernate. Note that it may be necessary to update -the rfkill subsystem's idea of what the current state is at resume time if -the state may have changed over suspend. - +For some platforms, it is possible that the hardware state changes during +suspend/hibernation, in which case it will be necessary to update the rfkill +core with the current state is at resume time. +To create an rfkill driver, driver's Kconfig needs to have -4. Kernel API + depends on RFKILL || !RFKILL -To build a driver with rfkill subsystem support, the driver should depend on -(or select) the Kconfig symbol RFKILL. - -The hardware the driver talks to may be write-only (where the current state -of the hardware is unknown), or read-write (where the hardware can be queried -about its current state). +to ensure the driver cannot be built-in when rfkill is modular. The !RFKILL +case allows the driver to be built when rfkill is not configured, which which +case all rfkill API can still be used but will be provided by static inlines +which compile to almost nothing. Calling rfkill_set_hw_state() when a state change happens is required from rfkill drivers that control devices that can be hard-blocked unless they also
@@ -105,10 +84,33 @@ device). Don't do this unless you cannot get the event in any other way. 5. Userspace support -The following sysfs entries exist for every rfkill device: +The recommended userspace interface to use is /dev/rfkill, which is a misc +character device that allows userspace to obtain and set the state of rfkill +devices and sets of devices. It also notifies userspace about device addition +and removal. The API is a simple read/write API that is defined in +linux/rfkill.h, with one ioctl that allows turning off the deprecated input +handler in the kernel for the transition period. + +Except for the one ioctl, communication with the kernel is done via read() +and write() of instances of 'struct rfkill_event'. In this structure, the +soft and hard block are properly separated (unlike sysfs, see below) and +userspace is able to get a consistent snapshot of all rfkill devices in the +system. Also, it is possible to switch all rfkill drivers (or all drivers of +a specified type) into a state which also updates the default state for +hotplugged devices. + +After an application opens /dev/rfkill, it can read the current state of +all devices, and afterwards can poll the descriptor for hotplug or state +change events. + +Applications must ignore operations (the "op" field) they do not handle, +this allows the API to be extended in the future. + +Additionally, each rfkill device is registered in sysfs and there has the +following attributes: name: Name assigned by driver to this key (interface or driver name). - type: Name of the key type ("wlan", "bluetooth", etc). + type: Driver type string ("wlan", "bluetooth", etc). state: Current state of the transmitter 0: RFKILL_STATE_SOFT_BLOCKED transmitter is turned off by software
@@ -117,7 +119,12 @@ The following sysfs entries exist for every rfkill device: 2: RFKILL_STATE_HARD_BLOCKED transmitter is forced off by something outside of the driver's control. - claim: 0: Kernel handles events (currently always reads that value) + This file is deprecated because it can only properly show + three of the four possible states, soft-and-hard-blocked is + missing. + claim: 0: Kernel handles events + This file is deprecated because there no longer is a way to + claim just control over a single rfkill instance. rfkill devices also issue uevents (with an action of "change"), with the following environment variables set:
@@ -128,9 +135,3 @@ RFKILL_TYPE The contents of these variables corresponds to the "name", "state" and "type" sysfs files explained above. - -An alternative userspace interface exists as a misc device /dev/rfkill, -which allows userspace to obtain and set the state of rfkill devices and -sets of devices. It also notifies userspace about device addition and -removal. The API is a simple read/write API that is defined in -linux/rfkill.h.
drivers/net/wireless/ath/ath5k/pcu.c +3 -2
@@ -733,8 +733,9 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)/* * Set the beacon register and enable all timers. */ -/* When in AP mode zero timer0 to start TSF */ -if (ah->ah_op_mode ==NL80211_IFTYPE_AP ) +/* When in AP or Mesh Point mode zero timer0 to start TSF */ +if (ah->ah_op_mode ==NL80211_IFTYPE_AP || + ah->ah_op_mode ==NL80211_IFTYPE_MESH_POINT )ath5k_hw_reg_write (ah,0 ,AR5K_TIMER0 );ath5k_hw_reg_write (ah, next_beacon,AR5K_TIMER0 );
drivers/net/wireless/ath/ath9k/Kconfig +0 -1
@@ -1,7 +1,6 @@ config ATH9K tristate "Atheros 802.11n wireless cards support" depends on PCI && MAC80211 && WLAN_80211 - depends on RFKILL || RFKILL=n select ATH_COMMON select MAC80211_LEDS select LEDS_CLASS
drivers/net/wireless/ath/ath9k/ath9k.h +1 -9
@@ -21,7 +21,6 @@#include <linux/device.h> #include <net/mac80211.h> #include <linux/leds.h> -#include <linux/rfkill.h> #include "hw.h" #include "rc.h"
@@ -460,12 +459,6 @@ struct ath_led {bool registered; }; -struct ath_rfkill { -struct rfkill *rfkill; -struct rfkill_ops ops; -char rfkill_name[32 ]; -}; -/********************/ /* Main driver core */ /********************/
@@ -505,7 +498,6 @@ struct ath_rfkill {#define SC_OP_PROTECT_ENABLE BIT(6)#define SC_OP_RXFLUSH BIT(7)#define SC_OP_LED_ASSOCIATED BIT(8) -#define SC_OP_RFKILL_REGISTERED BIT(9)#define SC_OP_WAIT_FOR_BEACON BIT(12)#define SC_OP_LED_ON BIT(13)#define SC_OP_SCANNING BIT(14)
@@ -591,7 +583,6 @@ struct ath_softc {int beacon_interval; -struct ath_rfkill rf_kill;struct ath_ani ani;struct ath9k_node_stats nodestats;#ifdef CONFIG_ATH9K_DEBUG
@@ -677,6 +668,7 @@ static inline void ath9k_ps_restore(struct ath_softc *sc)if (atomic_dec_and_test (&sc->ps_usecount))if ((sc->hw->conf.flags &IEEE80211_CONF_PS ) && !(sc->sc_flags & (SC_OP_WAIT_FOR_BEACON | +SC_OP_WAIT_FOR_CAB |SC_OP_WAIT_FOR_PSPOLL_DATA |SC_OP_WAIT_FOR_TX_ACK ))) ath9k_hw_setpower(sc->sc_ah,
drivers/net/wireless/ath/ath9k/hw.c +13 -16
@@ -2186,6 +2186,18 @@ static void ath9k_hw_spur_mitigate(struct ath_hw *ah, struct ath9k_channel *chanREG_WRITE (ah,AR_PHY_MASK2_P_61_45 , tmp_mask); } +static void ath9k_enable_rfkill (struct ath_hw *ah) +{ +REG_SET_BIT (ah,AR_GPIO_INPUT_EN_VAL , +AR_GPIO_INPUT_EN_VAL_RFSILENT_BB ); + +REG_CLR_BIT (ah,AR_GPIO_INPUT_MUX2 , +AR_GPIO_INPUT_MUX2_RFSILENT ); + +ath9k_hw_cfg_gpio_input (ah, ah->rfkill_gpio); +REG_SET_BIT (ah,AR_PHY_TEST ,RFSILENT_BB ); +} +int ath9k_hw_reset (struct ath_hw *ah,struct ath9k_channel *chan,bool bChannelChange) {
@@ -2313,10 +2325,9 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,ath9k_hw_init_interrupt_masks (ah, ah->opmode);ath9k_hw_init_qos (ah); -#if defined(CONFIG_RFKILL ) || defined(CONFIG_RFKILL_MODULE )if (ah->caps.hw_caps &ATH9K_HW_CAP_RFSILENT )ath9k_enable_rfkill (ah); -#endif +ath9k_hw_init_user_settings (ah); REG_WRITE(ah, AR_STA_ID1,
@@ -3613,20 +3624,6 @@ void ath9k_hw_set_gpio(struct ath_hw *ah, u32 gpio, u32 val) AR_GPIO_BIT(gpio)); } -#if defined(CONFIG_RFKILL ) || defined(CONFIG_RFKILL_MODULE ) -void ath9k_enable_rfkill (struct ath_hw *ah) -{ -REG_SET_BIT (ah,AR_GPIO_INPUT_EN_VAL , -AR_GPIO_INPUT_EN_VAL_RFSILENT_BB ); - -REG_CLR_BIT (ah,AR_GPIO_INPUT_MUX2 , -AR_GPIO_INPUT_MUX2_RFSILENT ); - -ath9k_hw_cfg_gpio_input (ah, ah->rfkill_gpio); -REG_SET_BIT (ah,AR_PHY_TEST ,RFSILENT_BB ); -} -#endif -u32 ath9k_hw_getdefantenna (struct ath_hw *ah) {return REG_READ (ah,AR_DEF_ANTENNA ) &0x7 ;
drivers/net/wireless/ath/ath9k/hw.h +0 -3
@@ -565,9 +565,6 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah, u32 gpio);void ath9k_hw_cfg_output (struct ath_hw *ah,u32 gpio,u32 ah_signal_type);void ath9k_hw_set_gpio (struct ath_hw *ah,u32 gpio,u32 val); -#if defined(CONFIG_RFKILL ) || defined(CONFIG_RFKILL_MODULE ) -void ath9k_enable_rfkill (struct ath_hw *ah); -#endif u32 ath9k_hw_getdefantenna (struct ath_hw *ah);void ath9k_hw_setantenna (struct ath_hw *ah,u32 antenna); bool ath9k_hw_setantennaswitch(struct ath_hw *ah,
drivers/net/wireless/ath/ath9k/main.c +41 -89
238 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/recv.c +1 -0
@@ -817,6 +817,7 @@ int ath_rx_tasklet(struct ath_softc *sc, int flush) }if (unlikely (sc->sc_flags & (SC_OP_WAIT_FOR_BEACON | +SC_OP_WAIT_FOR_CAB |SC_OP_WAIT_FOR_PSPOLL_DATA )))ath_rx_ps (sc, skb);
drivers/net/wireless/iwlwifi/iwl-agn.c +0 -1
@@ -2152,7 +2152,6 @@ static int iwl_mac_start(struct ieee80211_hw *hw)/* we should be verifying the device is ready to be opened */ mutex_lock (&priv->mutex); -memset (&priv->staging_rxon,0 ,sizeof (struct iwl_rxon_cmd ));/* fetch ucode file from disk, alloc and copy to bus-master buffers ... * ucode filename and max sizes are card-specific. */
drivers/net/wireless/iwlwifi/iwl-core.c +86 -55
198 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl3945-base.c +1 -3
@@ -2498,8 +2498,7 @@ static void iwl3945_alive_start(struct iwl_priv *priv)struct iwl3945_rxon_cmd *active_rxon = (struct iwl3945_rxon_cmd *)(&priv->active_rxon); -memcpy (&priv->staging_rxon, &priv->active_rxon, -sizeof (priv->staging_rxon)); + priv->staging_rxon.filter_flags |=RXON_FILTER_ASSOC_MSK ; active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK ; }else {/* Initialize our rx_config data */
@@ -3147,7 +3146,6 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)/* we should be verifying the device is ready to be opened */ mutex_lock (&priv->mutex); -memset (&priv->staging_rxon,0 ,sizeof (priv->staging_rxon));/* fetch ucode file from disk, alloc and copy to bus-master buffers ... * ucode filename and max sizes are card-specific. */
drivers/net/wireless/libertas/if_spi.c +6 -5
@@ -812,7 +812,6 @@ out:static void if_spi_e2h (struct if_spi_card *card) {int err =0 ; -unsigned long flags;u32 cause;struct lbs_private *priv = card->priv;
@@ -827,10 +826,7 @@ static void if_spi_e2h(struct if_spi_card *card)/* generate a card interrupt */ spu_write_u16 (card,IF_SPI_CARD_INT_CAUSE_REG ,IF_SPI_CIC_HOST_EVENT ); -spin_lock_irqsave (&priv->driver_lock, flags);lbs_queue_event (priv, cause &0xff ); -spin_unlock_irqrestore (&priv->driver_lock, flags); - out:if (err)lbs_pr_err ("%s: error %d\n" , __func__, err);
@@ -875,7 +871,12 @@ static int lbs_spi_thread(void *data) err =if_spi_c2h_data (card);if (err) goto err; -if (hiStatus &IF_SPI_HIST_CMD_DOWNLOAD_RDY ) { + +/* workaround: in PS mode, the card does not set the Command +* Download Ready bit, but it sets TX Download Ready. */ +if (hiStatus &IF_SPI_HIST_CMD_DOWNLOAD_RDY || + (card->priv->psstate !=PS_STATE_FULL_POWER && + (hiStatus &IF_SPI_HIST_TX_DOWNLOAD_RDY ))) {/* This means two things. First of all, * if there was a previous command sent, the card has * successfully received it.
drivers/platform/x86/dell-laptop.c +1 -1
@@ -177,7 +177,7 @@ dell_send_request(struct calling_interface_buffer *buffer, int class,static int dell_rfkill_set (void *data,bool blocked) {struct calling_interface_buffer buffer; -int disable = blocked ?0 :1 ; +int disable = blocked ?1 :0 ;unsigned long radio = (unsigned long )data;memset (&buffer,0 ,sizeof (struct calling_interface_buffer ));
drivers/platform/x86/sony-laptop.c +3 -2
@@ -1133,8 +1133,9 @@ static void sony_nc_rfkill_update()continue ;if (hwblock) { -if (rfkill_set_hw_state (sony_rfkill_devices[i], true)) -sony_nc_rfkill_set ((void *)i, true); +if (rfkill_set_hw_state (sony_rfkill_devices[i], true)) { +/* we already know we're blocked */ + }continue ; }
net/mac80211/debugfs.c +25 -0
@@ -163,6 +163,29 @@ static const struct file_operations noack_ops = { .open = mac80211_open_file_generic }; +static ssize_t queues_read (struct file *file,char __user *user_buf, +size_t count,loff_t *ppos) +{ +struct ieee80211_local *local = file->private_data; +unsigned long flags; +char buf[IEEE80211_MAX_QUEUES *20 ]; +int q, res =0 ; + +spin_lock_irqsave (&local->queue_stop_reason_lock, flags); +for (q =0 ; q < local->hw.queues; q++) + res +=sprintf (buf + res,"%02d: %#.8lx/%d\n" , q, + local->queue_stop_reasons[q], +__netif_subqueue_stopped (local->mdev, q)); +spin_unlock_irqrestore (&local->queue_stop_reason_lock, flags); + +return simple_read_from_buffer (user_buf, count, ppos, buf, res); +} + +static const struct file_operations queues_ops = { + .read = queues_read, + .open = mac80211_open_file_generic +}; +/* statistics stuff */ #define DEBUGFS_STATS_FILE(name, buflen, fmt, value...) \
@@ -298,6 +321,7 @@ void debugfs_hw_add(struct ieee80211_local *local)DEBUGFS_ADD (total_ps_buffered);DEBUGFS_ADD (wep_iv);DEBUGFS_ADD (tsf); +DEBUGFS_ADD (queues);DEBUGFS_ADD_MODE (reset,0200 );DEBUGFS_ADD (noack);
@@ -350,6 +374,7 @@ void debugfs_hw_del(struct ieee80211_local *local)DEBUGFS_DEL (total_ps_buffered);DEBUGFS_DEL (wep_iv);DEBUGFS_DEL (tsf); +DEBUGFS_DEL (queues);DEBUGFS_DEL (reset);DEBUGFS_DEL (noack);
net/mac80211/ieee80211_i.h +1 -1
@@ -783,6 +783,7 @@ struct ieee80211_local {struct dentry *total_ps_buffered;struct dentry *wep_iv;struct dentry *tsf; +struct dentry *queues;struct dentry *reset;struct dentry *noack;struct dentry *statistics;
@@ -1100,7 +1101,6 @@ void ieee802_11_parse_elems(u8 *start, size_t len,u32 ieee802_11_parse_elems_crc (u8 *start,size_t len,struct ieee802_11_elems *elems,u64 filter,u32 crc); -int ieee80211_set_freq (struct ieee80211_sub_if_data *sdata,int freq);u32 ieee80211_mandatory_rates (struct ieee80211_local *local,enum ieee80211_band band);
net/mac80211/mlme.c +26 -12
@@ -1102,14 +1102,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,struct sta_info *sta;u32 changed =0 , config_changed =0 ; -rcu_read_lock (); - - sta =sta_info_get (local, ifmgd->bssid); -if (!sta) { -rcu_read_unlock (); -return ; - } -if (deauth) { ifmgd->direct_probe_tries =0 ; ifmgd->auth_tries =0 ;
@@ -1120,7 +1112,11 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,netif_tx_stop_all_queues (sdata->dev);netif_carrier_off (sdata->dev); -ieee80211_sta_tear_down_BA_sessions (sta); +rcu_read_lock (); + sta =sta_info_get (local, ifmgd->bssid); +if (sta) +ieee80211_sta_tear_down_BA_sessions (sta); +rcu_read_unlock (); bss = ieee80211_rx_bss_get(local, ifmgd->bssid, conf->channel->center_freq,
@@ -1156,8 +1152,6 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, ifmgd->ssid, ifmgd->ssid_len); } -rcu_read_unlock (); -ieee80211_set_wmm_default (sdata);ieee80211_recalc_idle (local);
@@ -2223,7 +2217,10 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata) capa_mask, capa_val);if (bss) { -ieee80211_set_freq (sdata, bss->cbss.channel->center_freq); + local->oper_channel = bss->cbss.channel; + local->oper_channel_type =NL80211_CHAN_NO_HT ; +ieee80211_hw_config (local,0 ); +if (!(ifmgd->flags &IEEE80211_STA_SSID_SET ))ieee80211_sta_set_ssid (sdata, bss->ssid, bss->ssid_len);
@@ -2445,6 +2442,14 @@ void ieee80211_sta_req_auth(struct ieee80211_sub_if_data *sdata)ieee80211_set_disassoc (sdata, true, true,WLAN_REASON_DEAUTH_LEAVING ); +if (ifmgd->ssid_len ==0 ) { +/* +* Only allow association to be started if a valid SSID +* is configured. +*/ +return ; + } +if (!(ifmgd->flags &IEEE80211_STA_EXT_SME ) || ifmgd->state !=IEEE80211_STA_MLME_ASSOCIATE )set_bit (IEEE80211_STA_REQ_AUTH , &ifmgd->request);
@@ -2476,6 +2481,10 @@ int ieee80211_sta_set_ssid(struct ieee80211_sub_if_data *sdata, char *ssid, size ifmgd = &sdata->u.mgd;if (ifmgd->ssid_len != len ||memcmp (ifmgd->ssid, ssid, len) !=0 ) { +if (ifmgd->state ==IEEE80211_STA_MLME_ASSOCIATED ) +ieee80211_set_disassoc (sdata, true, true, +WLAN_REASON_DEAUTH_LEAVING ); +/* * Do not use reassociation if SSID is changed (different ESS). */
@@ -2500,6 +2509,11 @@ int ieee80211_sta_set_bssid(struct ieee80211_sub_if_data *sdata, u8 *bssid) {struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; +if (compare_ether_addr (bssid, ifmgd->bssid) !=0 && + ifmgd->state ==IEEE80211_STA_MLME_ASSOCIATED ) +ieee80211_set_disassoc (sdata, true, true, +WLAN_REASON_DEAUTH_LEAVING ); +if (is_valid_ether_addr (bssid)) {memcpy (ifmgd->bssid, bssid,ETH_ALEN ); ifmgd->flags |=IEEE80211_STA_BSSID_SET ;
net/mac80211/util.c +0 -25
@@ -774,31 +774,6 @@ void ieee80211_tx_skb(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb,dev_queue_xmit (skb); } -int ieee80211_set_freq (struct ieee80211_sub_if_data *sdata,int freqMHz) -{ -int ret = -EINVAL ; -struct ieee80211_channel *chan; -struct ieee80211_local *local = sdata->local; - - chan =ieee80211_get_channel (local->hw.wiphy, freqMHz); - -if (chan && !(chan->flags &IEEE80211_CHAN_DISABLED )) { -if (sdata->vif.type ==NL80211_IFTYPE_ADHOC && - chan->flags &IEEE80211_CHAN_NO_IBSS ) -return ret; - local->oper_channel = chan; - local->oper_channel_type =NL80211_CHAN_NO_HT ; - -if (local->sw_scanning || local->hw_scanning) - ret =0 ; -else - ret =ieee80211_hw_config ( - local,IEEE80211_CONF_CHANGE_CHANNEL ); - } - -return ret; -} -u32 ieee80211_mandatory_rates (struct ieee80211_local *local,enum ieee80211_band band) {
net/mac80211/wext.c +27 -4
@@ -55,6 +55,8 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev, struct iw_freq *freq, char *extra) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); +struct ieee80211_local *local = sdata->local; +struct ieee80211_channel *chan;if (sdata->vif.type ==NL80211_IFTYPE_ADHOC )return cfg80211_ibss_wext_siwfreq (dev, info, freq, extra);
@@ -69,17 +71,38 @@ static int ieee80211_ioctl_siwfreq(struct net_device *dev,IEEE80211_STA_AUTO_CHANNEL_SEL ;return 0 ; }else -return ieee80211_set_freq (sdata, + chan =ieee80211_get_channel (local->hw.wiphy,ieee80211_channel_to_frequency (freq->m)); }else {int i, div =1000000 ;for (i =0 ; i < freq->e; i++) div /=10 ; -if (div >0 ) -return ieee80211_set_freq (sdata, freq->m / div); -else +if (div <=0 )return -EINVAL ; + chan =ieee80211_get_channel (local->hw.wiphy, freq->m / div); } + +if (!chan) +return -EINVAL ; + +if (chan->flags &IEEE80211_CHAN_DISABLED ) +return -EINVAL ; + +/* +* no change except maybe auto -> fixed, ignore the HT +* setting so you can fix a channel you're on already +*/ +if (local->oper_channel == chan) +return 0 ; + +if (sdata->vif.type ==NL80211_IFTYPE_STATION ) +ieee80211_sta_req_auth (sdata); + + local->oper_channel = chan; + local->oper_channel_type =NL80211_CHAN_NO_HT ; +ieee80211_hw_config (local,0 ); + +return 0 ; }
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: Mon, 15 Jun 2009 16:36:44 -0400
Quoted 6 lines
This is a batch of (mostly) fixes instended for 2.6.31. Most of them are fixes, many with references to bug reports. Most of the rest is fall-out and stragglers related to the rfkill rework. There is also the addition of a debugfs file to aid debugging.
Please let me know if there are problems!
Pulled, thanks a lot John.