mac80211 maintenance
Subsystems (4)
Johannes Berg
maintainercover mac80211 maintenance
Here are two large mac80211 maintenance patches (including driver updates) that fix some of the callback mess.
Comments welcome -- especially on the driver changes!
johannes
Johannes Berg
maintainerRFC 1/2 mac80211: clean up beacon interval settings
We currently have two beacon interval configuration knobs:
hw.conf.beacon_int and vif.bss_info.beacon_int. This is rather confusing, even though the former is used when we beacon ourselves and the latter when we are associated to an AP.
This just deprecates the hw.conf.beacon_int setting in favour of always using vif.bss_info.beacon_int. Since it touches all the beaconing IBSS code anyway, we can also add support for the cfg80211 IBSS beacon interval configuration easily.
NOTE: The hw.conf.beacon_int setting is retained for now due
to drivers still using it -- I couldn't untangle all drivers, some are updated in this patch.
--- drivers/net/wireless/ath/ar9170/mac.c | 6 +++--- drivers/net/wireless/ath/ar9170/main.c | 5 ++++- drivers/net/wireless/ath/ath5k/base.c | 5 ++++- drivers/net/wireless/ath/ath9k/ath9k.h | 2 ++ drivers/net/wireless/ath/ath9k/beacon.c | 9 +++------ drivers/net/wireless/ath/ath9k/main.c | 22 ++++++++++++---------- drivers/net/wireless/ath/ath9k/xmit.c | 2 +- drivers/net/wireless/b43/main.c | 12 +++++++----- drivers/net/wireless/b43legacy/main.c | 10 +++++----- drivers/net/wireless/iwlwifi/iwl-agn.c | 3 ++- drivers/net/wireless/iwlwifi/iwl-core.c | 3 +-- drivers/net/wireless/iwlwifi/iwl3945-base.c | 5 ++--- drivers/net/wireless/libertas_tf/main.c | 2 +- drivers/net/wireless/mac80211_hwsim.c | 20 ++++++++++++-------- include/net/mac80211.h | 6 ++++-- net/mac80211/cfg.c | 17 +++++------------ net/mac80211/ibss.c | 25 +++++++++++++++++-------- net/mac80211/main.c | 17 +++++++++++------ net/mac80211/mlme.c | 1 + net/mac80211/sta_info.c | 12 ++++++------ net/mac80211/tx.c | 2 +- 21 files changed, 104 insertions(+), 82 deletions(-)
include/net/mac80211.h +4 -2
@@ -149,6 +149,7 @@ struct ieee80211_low_level_stats {* @BSS_CHANGED_ERP_SLOT: slot timing changed * @BSS_CHANGED_HT: 802.11n parameters changed * @BSS_CHANGED_BASIC_RATES: Basic rateset changed +* @BSS_CHANGED_BEACON_INT: Beacon interval changed */ enum ieee80211_bss_change {BSS_CHANGED_ASSOC =1 <<0 ,
@@ -157,6 +158,7 @@ enum ieee80211_bss_change {BSS_CHANGED_ERP_SLOT =1 <<3 ,BSS_CHANGED_HT =1 <<4 ,BSS_CHANGED_BASIC_RATES =1 <<5 , + BSS_CHANGED_BEACON_INT = 1<<6, };/**
@@ -529,7 +531,7 @@ enum ieee80211_conf_flags {* enum ieee80211_conf_changed - denotes which configuration changed * * @IEEE80211_CONF_CHANGE_RADIO_ENABLED: the value of radio_enabled changed -* @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: the beacon interval changed +* @IEEE80211_CONF_CHANGE_BEACON_INTERVAL: DEPRECATED * @IEEE80211_CONF_CHANGE_LISTEN_INTERVAL: the listen interval changed * @IEEE80211_CONF_CHANGE_RADIOTAP: the radiotap flag changed * @IEEE80211_CONF_CHANGE_PS: the PS flag or dynamic PS timeout changed
@@ -554,7 +556,7 @@ enum ieee80211_conf_changed {* This struct indicates how the driver shall configure the hardware. * * @radio_enabled: when zero, driver is required to switch off the radio. -* @beacon_int: beacon interval (TODO make interface config) +* @beacon_int: beacon interval -- deprecated!! * @listen_interval: listen interval in units of beacon interval * @flags: configuration flags defined above * @power_level: requested transmit power (in dBm)
net/mac80211/cfg.c +5 -12
@@ -451,18 +451,11 @@ static int ieee80211_config_beacon(struc* This is a kludge. beacon interval should really be part * of the beacon information. */ -if (params->interval && (sdata->local->hw.conf.beacon_int != - params->interval)) { - sdata->local->hw.conf.beacon_int = params->interval; - err =ieee80211_hw_config (sdata->local, -IEEE80211_CONF_CHANGE_BEACON_INTERVAL ); -if (err <0 ) -return err; -/* -* We updated some parameter so if below bails out -* it's not an error. -*/ - err =0 ; +if (params->interval && + (sdata->vif.bss_conf.beacon_int != params->interval)) { + sdata->vif.bss_conf.beacon_int = params->interval; +ieee80211_bss_info_change_notify (sdata, +BSS_CHANGED_BEACON_INT ); }/* Need to have a beacon head if we don't have one yet */
net/mac80211/ibss.c +17 -8
@@ -73,6 +73,7 @@ static void __ieee80211_sta_join_ibss(ststruct ieee80211_mgmt *mgmt;u8 *pos;struct ieee80211_supported_band *sband; +u32 bss_change;if (local->ops->reset_tsf) {/* Reset own TSF to allow time synchronization work. */
@@ -92,8 +93,6 @@ static void __ieee80211_sta_join_ibss(stmemcpy (ifibss->bssid, bssid,ETH_ALEN ); - local->hw.conf.beacon_int = beacon_int >=10 ? beacon_int :10 ; - sdata->drop_unencrypted = capability &WLAN_CAPABILITY_PRIVACY ?1 :0 ;ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID );
@@ -101,6 +100,12 @@ static void __ieee80211_sta_join_ibss(st local->oper_channel = chan; local->oper_channel_type =NL80211_CHAN_NO_HT ;ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); + + sdata->vif.bss_conf.beacon_int = beacon_int; + bss_change =BSS_CHANGED_BEACON_INT ; + bss_change |=ieee80211_reset_erp_info (sdata); +ieee80211_bss_info_change_notify (sdata, bss_change); + sband = local->hw.wiphy->bands[chan->band];/* Build IBSS probe response */
@@ -111,7 +116,7 @@ static void __ieee80211_sta_join_ibss(stmemset (mgmt->da,0xff ,ETH_ALEN );memcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN );memcpy (mgmt->bssid, ifibss->bssid,ETH_ALEN ); - mgmt->u.beacon.beacon_int =cpu_to_le16 (local->hw.conf.beacon_int); + mgmt->u.beacon.beacon_int =cpu_to_le16 (beacon_int); mgmt->u.beacon.timestamp =cpu_to_le64 (tsf); mgmt->u.beacon.capab_info =cpu_to_le16 (capability);
@@ -181,8 +186,13 @@ static void __ieee80211_sta_join_ibss(ststatic void ieee80211_sta_join_ibss (struct ieee80211_sub_if_data *sdata,struct ieee80211_bss *bss) { +u16 beacon_int = bss->cbss.beacon_interval; + +if (beacon_int <10 ) + beacon_int =10 ; + __ieee80211_sta_join_ibss(sdata, bss->cbss.bssid, - bss->cbss.beacon_interval, + beacon_int, bss->cbss.channel, bss->supp_rates_len, bss->supp_rates, bss->cbss.capability,
@@ -471,9 +481,6 @@ static void ieee80211_sta_create_ibss(st sband = local->hw.wiphy->bands[ifibss->channel->band]; -if (local->hw.conf.beacon_int ==0 ) - local->hw.conf.beacon_int =100 ; - capability =WLAN_CAPABILITY_IBSS ;if (sdata->default_key)
@@ -487,7 +494,7 @@ static void ieee80211_sta_create_ibss(st *pos++ = (u8) (rate /5 ); } -__ieee80211_sta_join_ibss (sdata, bssid, local->hw.conf.beacon_int, +__ieee80211_sta_join_ibss (sdata, bssid, sdata->vif.bss_conf.beacon_int, ifibss->channel, sband->n_bitrates, supp_rates, capability,0 ); }
@@ -836,6 +843,8 @@ int ieee80211_ibss_join(struct ieee80211 }else sdata->u.ibss.fixed_bssid = false; + sdata->vif.bss_conf.beacon_int = params->beacon_interval; + sdata->u.ibss.channel = params->channel; sdata->u.ibss.fixed_channel = params->channel_fixed;
net/mac80211/main.c +11 -6
@@ -294,9 +294,6 @@ void ieee80211_bss_info_change_notify(st {struct ieee80211_local *local = sdata->local; -if (WARN_ON (sdata->vif.type ==NL80211_IFTYPE_AP_VLAN )) -return ; -if (!changed)return ;
@@ -305,6 +302,17 @@ void ieee80211_bss_info_change_notify(st &sdata->vif, &sdata->vif.bss_conf, changed); + +/* +* DEPRECATED +* +* ~changed is just there to not do this at resume time +*/ +if (changed &BSS_CHANGED_BEACON_INT && ~changed) { + local->hw.conf.beacon_int = sdata->vif.bss_conf.beacon_int; +ieee80211_hw_config (local, +IEEE80211_CONF_CHANGE_BEACON_INTERVAL ); + } }u32 ieee80211_reset_erp_info (struct ieee80211_sub_if_data *sdata)
@@ -969,9 +977,6 @@ int ieee80211_register_hw(struct ieee802debugfs_hw_add (local); -if (local->hw.conf.beacon_int <10 ) - local->hw.conf.beacon_int =100 ; -if (local->hw.max_listen_interval ==0 ) local->hw.max_listen_interval =1 ;
net/mac80211/sta_info.c +6 -6
@@ -543,9 +543,8 @@ void sta_info_unlink(struct sta_info **sspin_unlock_irqrestore (&local->sta_lock, flags); } -static inline int sta_info_buffer_expired (struct ieee80211_local *local, -struct sta_info *sta, -struct sk_buff *skb) +static int sta_info_buffer_expired (struct sta_info *sta, +struct sk_buff *skb) {struct ieee80211_tx_info *info;int timeout;
@@ -556,8 +555,9 @@ static inline int sta_info_buffer_expire info =IEEE80211_SKB_CB (skb);/* Timeout: (2 * listen_interval * beacon_int * 1024 / 1000000) sec */ - timeout = (sta->listen_interval * local->hw.conf.beacon_int *32 / -15625 ) *HZ ; + timeout = (sta->listen_interval * + sta->sdata->vif.bss_conf.beacon_int * +32 /15625 ) *HZ ;if (timeout <STA_TX_BUFFER_EXPIRE ) timeout =STA_TX_BUFFER_EXPIRE ;return time_after (jiffies, info->control.jiffies + timeout);
@@ -577,7 +577,7 @@ static void sta_info_cleanup_expire_bufffor (;;) {spin_lock_irqsave (&sta->ps_tx_buf.lock, flags); skb =skb_peek (&sta->ps_tx_buf); -if (sta_info_buffer_expired (local, sta, skb)) +if (sta_info_buffer_expired (sta, skb)) skb =__skb_dequeue (&sta->ps_tx_buf);else skb =NULL ;
net/mac80211/tx.c +1 -1
@@ -2132,7 +2132,7 @@ struct sk_buff *ieee80211_beacon_get(strmemcpy (mgmt->sa, sdata->dev->dev_addr,ETH_ALEN );/* BSSID is left zeroed, wildcard value */ mgmt->u.beacon.beacon_int = -cpu_to_le16 (local->hw.conf.beacon_int); +cpu_to_le16 (sdata->vif.bss_conf.beacon_int); mgmt->u.beacon.capab_info =0x0 ;/* 0x0 for MPs */ pos =skb_put (skb,2 );
net/mac80211/mlme.c +1 -0
@@ -826,6 +826,7 @@ static void ieee80211_set_associated(str sdata->vif.bss_conf.timestamp = bss->cbss.tsf; sdata->vif.bss_conf.dtim_period = bss->dtim_period; + bss_info_changed |=BSS_CHANGED_BEACON_INT ; bss_info_changed |=ieee80211_handle_bss_capability (sdata, bss->cbss.capability, bss->has_erp_value, bss->erp_value);
drivers/net/wireless/ath/ar9170/mac.c +3 -3
@@ -316,9 +316,9 @@ int ar9170_set_beacon_timers(struct ar91u32 v =0 ;u32 pretbtt =0 ; - v |= ar->hw->conf.beacon_int; -if (ar->vif) { + v |= ar->vif->bss_conf.beacon_int; +switch (ar->vif->type) {case NL80211_IFTYPE_MESH_POINT :case NL80211_IFTYPE_ADHOC :
@@ -326,7 +326,7 @@ int ar9170_set_beacon_timers(struct ar91break ;case NL80211_IFTYPE_AP : v |=BIT (24 ); - pretbtt = (ar->hw->conf.beacon_int -6 ) <<16 ; + pretbtt = (ar->vif->bss_conf.beacon_int -6 ) <<16 ;break ;default :break ;
drivers/net/wireless/ath/ar9170/main.c +4 -1
@@ -1337,7 +1337,7 @@ static int ar9170_op_config(struct ieee8 goto out; } -if (changed &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) { +if (changed &BSS_CHANGED_BEACON_INT ) { err =ar9170_set_beacon_timers (ar);if (err) goto out;
@@ -1499,6 +1499,9 @@ static void ar9170_op_bss_info_changed(s#endif /* CONFIG_AR9170_LEDS */ } +if (changed &BSS_CHANGED_BEACON_INT ) + err =ar9170_set_beacon_timers (ar); +if (changed &BSS_CHANGED_HT ) {/* TODO */ err =0 ;
drivers/net/wireless/ath/ath5k/base.c +4 -1
@@ -2756,7 +2756,6 @@ ath5k_config(struct ieee80211_hw *hw, u3mutex_lock (&sc->lock); - sc->bintval = conf->beacon_int; sc->power_level = conf->power_level; ret =ath5k_chan_set (sc, conf->channel);
@@ -3083,6 +3082,10 @@ static void ath5k_bss_info_changed(struc u32 changes) {struct ath5k_softc *sc = hw->priv; + +if (changes &BSS_CHANGED_BEACON_INT ) + sc->bintval = bss_conf->beacon_int; +if (changes &BSS_CHANGED_ASSOC ) {mutex_lock (&sc->lock); sc->assoc = bss_conf->assoc;
drivers/net/wireless/mac80211_hwsim.c +12 -8
@@ -554,18 +554,13 @@ static int mac80211_hwsim_config(structstruct mac80211_hwsim_data *data = hw->priv;struct ieee80211_conf *conf = &hw->conf; -printk (KERN_DEBUG "%s:%s (freq=%d radio_enabled=%d beacon_int=%d)\n" , +printk (KERN_DEBUG "%s:%s (freq=%d radio_enabled=%d)\n" ,wiphy_name (hw->wiphy), __func__, - conf->channel->center_freq, conf->radio_enabled, - conf->beacon_int); + conf->channel->center_freq, conf->radio_enabled); data->channel = conf->channel; data->radio_enabled = conf->radio_enabled; - data->beacon_int =1024 * conf->beacon_int /1000 *HZ /1000 ; -if (data->beacon_int <1 ) - data->beacon_int =1 ; - -if (!data->started || !data->radio_enabled) +if (!data->started || !data->radio_enabled || !data->beacon_int)del_timer (&data->beacon_timer);else mod_timer (&data->beacon_timer, jiffies + data->beacon_int);
@@ -616,6 +611,7 @@ static void mac80211_hwsim_bss_info_chan u32 changed) {struct hwsim_vif_priv *vp = (void *)vif->drv_priv; +struct mac80211_hwsim_data *data = hw->priv;hwsim_check_magic (vif);
@@ -629,6 +625,14 @@ static void mac80211_hwsim_bss_info_chan vp->aid = info->aid; } +if (changed &BSS_CHANGED_BEACON_INT ) { +printk (KERN_DEBUG " %s: BCNINT: %d\n" , +wiphy_name (hw->wiphy), info->beacon_int); + data->beacon_int =1024 * info->beacon_int /1000 *HZ /1000 ; +if (WARN_ON (data->beacon_int)) + data->beacon_int =1 ; + } +if (changed &BSS_CHANGED_ERP_CTS_PROT ) {printk (KERN_DEBUG " %s: ERP_CTS_PROT: %d\n" ,wiphy_name (hw->wiphy), info->use_cts_prot);
drivers/net/wireless/b43/main.c +7 -5
@@ -3468,11 +3468,6 @@ static int b43_op_config(struct ieee8021if (phy->ops->set_rx_antenna) phy->ops->set_rx_antenna (dev, antenna); -/* Update templates for AP/mesh mode. */ -if (b43_is_mode (wl,NL80211_IFTYPE_AP ) || -b43_is_mode (wl,NL80211_IFTYPE_MESH_POINT )) -b43_set_beacon_int (dev, conf->beacon_int); -if (!!conf->radio_enabled != phy->radio_on) {if (conf->radio_enabled) {b43_software_rfkill (dev, false);
@@ -3556,6 +3551,13 @@ static void b43_op_bss_info_changed(stru goto out_unlock_mutex;b43_mac_suspend (dev); +/* Update templates for AP/mesh mode. */ +if (changed &BSS_CHANGED_BEACON_INT && + (b43_is_mode (wl,NL80211_IFTYPE_AP ) || +b43_is_mode (wl,NL80211_IFTYPE_MESH_POINT ) || +b43_is_mode (wl,NL80211_IFTYPE_ADHOC ))) +b43_set_beacon_int (dev, conf->beacon_int); +if (changed &BSS_CHANGED_BASIC_RATES )b43_update_basic_rates (dev, conf->basic_rates);
drivers/net/wireless/ath/ath9k/beacon.c +3 -6
@@ -320,8 +320,7 @@ int ath_beacon_alloc(struct ath_wiphy *au64 tsfadjust;int intval; - intval = sc->hw->conf.beacon_int ? - sc->hw->conf.beacon_int :ATH_DEFAULT_BINTVAL ; + intval = sc->beacon_interval ? :ATH_DEFAULT_BINTVAL ;/* * Calculate the TSF offset for this beacon slot, i.e., the
@@ -431,8 +430,7 @@ void ath_beacon_tasklet(unsigned long da* on the tsf to safeguard against missing an swba. */ - intval = sc->hw->conf.beacon_int ? - sc->hw->conf.beacon_int :ATH_DEFAULT_BINTVAL ; + intval = sc->beacon_interval ? :ATH_DEFAULT_BINTVAL ; tsf =ath9k_hw_gettsf64 (ah); tsftu =TSF_TO_TU (tsf>>32 , tsf);
@@ -711,8 +709,7 @@ void ath_beacon_config(struct ath_softc/* Setup the beacon configuration parameters */ memset (&conf,0 ,sizeof (struct ath_beacon_config )); - conf.beacon_interval = sc->hw->conf.beacon_int ? - sc->hw->conf.beacon_int :ATH_DEFAULT_BINTVAL ; + conf.beacon_interval = sc->beacon_interval ? :ATH_DEFAULT_BINTVAL ; conf.listen_interval =1 ; conf.dtim_period = conf.beacon_interval; conf.dtim_count =1 ;
drivers/net/wireless/ath/ath9k/ath9k.h +2 -0
@@ -589,6 +589,8 @@ struct ath_softc {int led_on_cnt;int led_off_cnt; +int beacon_interval; +struct ath_rfkill rf_kill;struct ath_ani ani;struct ath9k_node_stats nodestats;
drivers/net/wireless/ath/ath9k/main.c +12 -10
@@ -2301,16 +2301,6 @@ skip_chan_change:if (changed &IEEE80211_CONF_CHANGE_POWER ) sc->config.txpowlimit =2 * conf->power_level; -/* -* The HW TSF has to be reset when the beacon interval changes. -* We set the flag here, and ath_beacon_config_ap() would take this -* into account when it gets called through the subsequent -* config_interface() call - with IFCC_BEACON in the changed field. -*/ - -if (changed &IEEE80211_CONF_CHANGE_BEACON_INTERVAL ) - sc->sc_flags |=SC_OP_TSF_RESET ; -mutex_unlock (&sc->mutex);return 0 ;
@@ -2578,6 +2568,18 @@ static void ath9k_bss_info_changed(strucath9k_bss_assoc_info (sc, vif, bss_conf); } +/* +* The HW TSF has to be reset when the beacon interval changes. +* We set the flag here, and ath_beacon_config_ap() would take this +* into account when it gets called through the subsequent +* config_interface() call - with IFCC_BEACON in the changed field. +*/ + +if (changed &BSS_CHANGED_BEACON_INT ) { + sc->sc_flags |=SC_OP_TSF_RESET ; + sc->beacon_interval = bss_conf->beacon_int; + } +mutex_unlock (&sc->mutex); }
drivers/net/wireless/ath/ath9k/xmit.c +1 -1
@@ -971,7 +971,7 @@ int ath_cabq_update(struct ath_softc *scelse if (sc->config.cabqReadytime >ATH9K_READY_TIME_HI_BOUND ) sc->config.cabqReadytime =ATH9K_READY_TIME_HI_BOUND ; - qi.tqi_readyTime = (sc->hw->conf.beacon_int * + qi.tqi_readyTime = (sc->beacon_interval * sc->config.cabqReadytime) /100 ;ath_txq_update (sc, qnum, &qi);
drivers/net/wireless/b43legacy/main.c +5 -5
@@ -2721,11 +2721,6 @@ static int b43legacy_op_dev_config(struc/* Antennas for RX and management frame TX. */ b43legacy_mgmtframe_txantenna (dev, antenna_tx); -/* Update templates for AP mode. */ -if (b43legacy_is_mode (wl,NL80211_IFTYPE_AP )) -b43legacy_set_beacon_int (dev, conf->beacon_int); - -if (!!conf->radio_enabled != phy->radio_on) {if (conf->radio_enabled) {b43legacy_radio_turn_on (dev);
@@ -2827,6 +2822,11 @@ static void b43legacy_op_bss_info_changeb43legacy_mac_suspend (dev); +if (changed &BSS_CHANGED_BEACON_INT && + (b43legacy_is_mode (wl,NL80211_IFTYPE_AP ) || +b43legacy_is_mode (wl,NL80211_IFTYPE_ADHOC ))) +b43legacy_set_beacon_int (dev, conf->beacon_int); +if (changed &BSS_CHANGED_BASIC_RATES )b43legacy_update_basic_rates (dev, conf->basic_rates);
drivers/net/wireless/iwlwifi/iwl3945-base.c +2 -3
@@ -551,7 +551,8 @@ static void iwl3945_setup_rxon_timing(st priv->rxon_timing.atim_window =0 ; }else { priv->rxon_timing.beacon_interval = -iwl3945_adjust_beacon_interval (conf->beacon_int); +iwl3945_adjust_beacon_interval ( + priv->vif->bss_conf.beacon_int);/* TODO: we need to get atim_window from upper stack * for now we set to 0 */ priv->rxon_timing.atim_window =0 ;
@@ -4121,8 +4122,6 @@ static int iwl3945_setup_mac(struct iwl_/* Default value; 4 EDCA QOS priorities */ hw->queues =4 ; - hw->conf.beacon_int =100 ; -if (priv->bands[IEEE80211_BAND_2GHZ ].n_channels) priv->hw->wiphy->bands[IEEE80211_BAND_2GHZ ] = &priv->bands[IEEE80211_BAND_2GHZ ];
drivers/net/wireless/iwlwifi/iwl-agn.c +2 -1
@@ -564,7 +564,8 @@ static void iwl_setup_rxon_timing(struct beacon_int =iwl_adjust_beacon_interval (priv->beacon_int); priv->rxon_timing.atim_window =0 ; }else { - beacon_int =iwl_adjust_beacon_interval (conf->beacon_int); + beacon_int =iwl_adjust_beacon_interval ( + priv->vif->bss_conf.beacon_int);/* TODO: we need to get atim_window from upper stack * for now we set to 0 */
drivers/net/wireless/iwlwifi/iwl-core.c +1 -2
@@ -1309,7 +1309,6 @@ int iwl_setup_mac(struct iwl_priv *priv)/* Default value; 4 EDCA QOS priorities */ hw->queues =4 ; - hw->conf.beacon_int =100 ; hw->max_listen_interval =IWL_CONN_MAX_LISTEN_INTERVAL ;if (priv->bands[IEEE80211_BAND_2GHZ ].n_channels)
@@ -2740,7 +2739,7 @@ void iwl_mac_reset_tsf(struct ieee80211_ priv->ibss_beacon =NULL ; - priv->beacon_int = priv->hw->conf.beacon_int; + priv->beacon_int = priv->vif->bss_conf.beacon_int; priv->timestamp =0 ;if ((priv->iw_mode ==NL80211_IFTYPE_STATION )) priv->beacon_int =0 ;
drivers/net/wireless/libertas_tf/main.c +1 -1
@@ -380,7 +380,7 @@ static int lbtf_op_config_interface(struif (beacon) {lbtf_beacon_set (priv, beacon);kfree_skb (beacon); -lbtf_beacon_ctrl (priv,1 , hw->conf.beacon_int); +lbtf_beacon_ctrl (priv,1 , vif->bss_conf.beacon_int); }break ;default :
Johannes Berg
maintainerRFC 2/2 mac80211: unify config_interface and bss_info_changed
In reply to Johannes BergThe config_interface method is a little strange, it contains the BSSID and beacon updates, while bss_info_changed contains most other BSS information for each interface. This patch removes config_interface and rolls all the information it previously passed to drivers into bss_info_changed.
---
Tested with ar9170, zd1211, p54 and iwlagn.
drivers/net/wireless/adm8211.c | 14 +- drivers/net/wireless/at76c50x-usb.c | 15 +- drivers/net/wireless/ath/ar9170/main.c | 39 +----- drivers/net/wireless/ath/ath5k/base.c | 71 ++++------ drivers/net/wireless/ath/ath9k/main.c | 182 ++++++++++++---------------- drivers/net/wireless/b43/main.c | 64 ++++----- drivers/net/wireless/b43legacy/main.c | 63 +++------ drivers/net/wireless/iwlwifi/iwl-agn.c | 1 drivers/net/wireless/iwlwifi/iwl-core.c | 156 ++++++++---------------- drivers/net/wireless/iwlwifi/iwl-core.h | 3 drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 drivers/net/wireless/libertas_tf/main.c | 56 +++----- drivers/net/wireless/mac80211_hwsim.c | 25 +-- drivers/net/wireless/mwl8k.c | 18 -- drivers/net/wireless/p54/p54common.c | 63 +++------ drivers/net/wireless/rt2x00/rt2400pci.c | 1 drivers/net/wireless/rt2x00/rt2500pci.c | 1 drivers/net/wireless/rt2x00/rt2500usb.c | 1 drivers/net/wireless/rt2x00/rt2x00.h | 3 drivers/net/wireless/rt2x00/rt2x00mac.c | 88 +++++-------- drivers/net/wireless/rt2x00/rt61pci.c | 1 drivers/net/wireless/rt2x00/rt73usb.c | 1 drivers/net/wireless/rtl818x/rtl8180_dev.c | 33 ++--- drivers/net/wireless/rtl818x/rtl8187_dev.c | 48 +++---- drivers/net/wireless/zd1211rw/zd_mac.c | 80 +++++------- include/net/mac80211.h | 51 ++----- net/mac80211/cfg.c | 8 - net/mac80211/ibss.c | 18 +- net/mac80211/ieee80211_i.h | 1 net/mac80211/main.c | 131 ++++++++------------ net/mac80211/mesh.c | 6 net/mac80211/mlme.c | 8 - net/mac80211/scan.c | 8 - net/mac80211/util.c | 17 -- 34 files changed, 498 insertions(+), 778 deletions(-)
include/net/mac80211.h +13 -38
@@ -150,6 +150,12 @@ struct ieee80211_low_level_stats {* @BSS_CHANGED_HT: 802.11n parameters changed * @BSS_CHANGED_BASIC_RATES: Basic rateset changed * @BSS_CHANGED_BEACON_INT: Beacon interval changed +* @BSS_CHANGED_BSSID: BSSID changed, for whatever +* reason (IBSS and managed mode) +* @BSS_CHANGED_BEACON: Beacon data changed, retrieve +* new beacon (beaconing modes) +* @BSS_CHANGED_BEACON_ENABLED: Beaconing should be +* enabled/disabled (beaconing modes) */ enum ieee80211_bss_change {BSS_CHANGED_ASSOC =1 <<0 ,
@@ -159,6 +165,9 @@ enum ieee80211_bss_change {BSS_CHANGED_HT =1 <<4 ,BSS_CHANGED_BASIC_RATES =1 <<5 ,BSS_CHANGED_BEACON_INT =1 <<6 , +BSS_CHANGED_BSSID =1 <<7 , +BSS_CHANGED_BEACON =1 <<8 , + BSS_CHANGED_BEACON_ENABLED = 1<<9, };/**
@@ -192,8 +201,11 @@ struct ieee80211_bss_ht_conf {* @basic_rates: bitmap of basic rates, each bit stands for an * index into the rate table configured by the driver in * the current band. +* @bssid: The BSSID for this BSS +* @enable_beacon: whether beaconing should be enabled or not */ struct ieee80211_bss_conf { +const u8 *bssid;/* association related data */ bool assoc;u16 aid;
@@ -201,6 +213,7 @@ struct ieee80211_bss_conf {bool use_cts_prot;bool use_short_preamble;bool use_short_slot; +bool enable_beacon;u8 dtim_period;u16 beacon_int;u16 assoc_capability;
@@ -639,37 +652,6 @@ struct ieee80211_if_init_conf { };/** -* enum ieee80211_if_conf_change - interface config change flags -* -* @IEEE80211_IFCC_BSSID: The BSSID changed. -* @IEEE80211_IFCC_BEACON: The beacon for this interface changed -* (currently AP and MESH only), use ieee80211_beacon_get(). -* @IEEE80211_IFCC_BEACON_ENABLED: The enable_beacon value changed. -*/ -enum ieee80211_if_conf_change { -IEEE80211_IFCC_BSSID =BIT (0 ), -IEEE80211_IFCC_BEACON =BIT (1 ), -IEEE80211_IFCC_BEACON_ENABLED =BIT (2 ), -}; - -/** -* struct ieee80211_if_conf - configuration of an interface -* -* @changed: parameters that have changed, see &enum ieee80211_if_conf_change. -* @bssid: BSSID of the network we are associated to/creating. -* @enable_beacon: Indicates whether beacons can be sent. -* This is valid only for AP/IBSS/MESH modes. -* -* This structure is passed to the config_interface() callback of -* &struct ieee80211_hw. -*/ -struct ieee80211_if_conf { -u32 changed; -const u8 *bssid; -bool enable_beacon; -}; - -/** * enum ieee80211_key_alg - key algorithm * @ALG_WEP: WEP40 or WEP104 * @ALG_TKIP: TKIP
@@ -1337,10 +1319,6 @@ enum ieee80211_ampdu_mlme_action {* This function should never fail but returns a negative error code * if it does. * -* @config_interface: Handler for configuration requests related to interfaces -* (e.g. BSSID changes.) -* Returns a negative error code which will be seen in userspace. -* * @bss_info_changed: Handler for configuration requests related to BSS * parameters that may vary during BSS's lifespan, and may affect low * level driver (e.g. assoc/disassoc status, erp parameters).
@@ -1442,9 +1420,6 @@ struct ieee80211_ops {void (*remove_interface)(struct ieee80211_hw *hw,struct ieee80211_if_init_conf *conf);int (*config)(struct ieee80211_hw *hw,u32 changed); -int (*config_interface)(struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf); void (*bss_info_changed)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info,
net/mac80211/ibss.c +8 -10
@@ -95,17 +95,10 @@ static void __ieee80211_sta_join_ibss(st sdata->drop_unencrypted = capability &WLAN_CAPABILITY_PRIVACY ?1 :0 ; -ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID ); - local->oper_channel = chan; local->oper_channel_type =NL80211_CHAN_NO_HT ;ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); - sdata->vif.bss_conf.beacon_int = beacon_int; - bss_change =BSS_CHANGED_BEACON_INT ; - bss_change |=ieee80211_reset_erp_info (sdata); -ieee80211_bss_info_change_notify (sdata, bss_change); - sband = local->hw.wiphy->bands[chan->band];/* Build IBSS probe response */
@@ -161,8 +154,13 @@ static void __ieee80211_sta_join_ibss(strcu_assign_pointer (ifibss->presp, skb); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); + sdata->vif.bss_conf.beacon_int = beacon_int; + bss_change =BSS_CHANGED_BEACON_INT ; + bss_change |=ieee80211_reset_erp_info (sdata); + bss_change |=BSS_CHANGED_BSSID ; + bss_change |=BSS_CHANGED_BEACON ; + bss_change |=BSS_CHANGED_BEACON_ENABLED ; +ieee80211_bss_info_change_notify (sdata, bss_change); rates =0 ;for (i =0 ; i < supp_rates_len; i++) {
@@ -889,7 +887,7 @@ int ieee80211_ibss_leave(struct ieee8021kfree (sdata->u.ibss.ie); skb = sdata->u.ibss.presp;rcu_assign_pointer (sdata->u.ibss.presp,NULL ); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED );synchronize_rcu ();kfree_skb (skb);
net/mac80211/ieee80211_i.h +0 -1
@@ -905,7 +905,6 @@ static inline int ieee80211_bssid_match(int ieee80211_hw_config (struct ieee80211_local *local,u32 changed); -int ieee80211_if_config (struct ieee80211_sub_if_data *sdata,u32 changed);void ieee80211_tx_set_protected (struct ieee80211_tx_data *tx);void ieee80211_bss_info_change_notify (struct ieee80211_sub_if_data *sdata,u32 changed);
net/mac80211/main.c +55 -76
143 lines not on this page · raw message
net/mac80211/mlme.c +2 -6
@@ -2280,12 +2280,8 @@ int ieee80211_sta_set_bssid(struct ieee8 ifmgd->flags &= ~IEEE80211_STA_BSSID_SET ; } -if (netif_running (sdata->dev)) { -if (ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID )) { -printk (KERN_DEBUG "%s: Failed to config new BSSID to " -"the low-level driver\n" , sdata->dev->name); - } - } +if (netif_running (sdata->dev)) +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BSSID );return ieee80211_sta_commit (sdata); }
net/mac80211/scan.c +4 -4
@@ -342,8 +342,8 @@ void ieee80211_scan_completed(struct ieeif (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_ADHOC || sdata->vif.type ==NL80211_IFTYPE_MESH_POINT ) -ieee80211_if_config (sdata, -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify ( + sdata,BSS_CHANGED_BEACON_ENABLED ); }mutex_unlock (&local->iflist_mtx);
@@ -515,8 +515,8 @@ int ieee80211_start_scan(struct ieee8021if (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_ADHOC || sdata->vif.type ==NL80211_IFTYPE_MESH_POINT ) -ieee80211_if_config (sdata, -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify ( + sdata,BSS_CHANGED_BEACON_ENABLED );if (sdata->vif.type ==NL80211_IFTYPE_STATION ) {if (sdata->u.mgd.flags &IEEE80211_STA_ASSOCIATED ) {
net/mac80211/cfg.c +5 -3
@@ -521,8 +521,9 @@ static int ieee80211_config_beacon(struckfree (old); -return ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED | +BSS_CHANGED_BEACON ); +return 0 ; } static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
@@ -573,7 +574,8 @@ static int ieee80211_del_beacon(struct wsynchronize_rcu ();kfree (old); -return ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED ); +return 0 ; }/* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */
net/mac80211/mesh.c +3 -3
@@ -417,7 +417,7 @@ static void ieee80211_mesh_housekeeping( free_plinks =mesh_plink_availables (sdata);if (free_plinks != sdata->u.mesh.accepting_plinks) -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON ); ifmsh->housekeeping = false; mod_timer(&ifmsh->housekeeping_timer,
@@ -432,8 +432,8 @@ void ieee80211_start_mesh(struct ieee802 ifmsh->housekeeping = true;queue_work (local->hw.workqueue, &ifmsh->work); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON | +BSS_CHANGED_BEACON_ENABLED ); }void ieee80211_stop_mesh (struct ieee80211_sub_if_data *sdata)
net/mac80211/util.c +3 -14
@@ -1063,24 +1063,13 @@ int ieee80211_reconfig(struct ieee80211_switch (sdata->vif.type) {case NL80211_IFTYPE_STATION :/* disable beacon change bits */ - changed &= ~IEEE80211_IFCC_BEACON ; + changed &= ~(BSS_CHANGED_BEACON | +BSS_CHANGED_BEACON_ENABLED );/* fall through */ case NL80211_IFTYPE_ADHOC :case NL80211_IFTYPE_AP :case NL80211_IFTYPE_MESH_POINT : -/* -* Driver's config_interface can fail if rfkill is -* enabled. Accommodate this return code. -* FIXME: When mac80211 has knowledge of rfkill -* state the code below can change back to: -* WARN(ieee80211_if_config(sdata, changed)); -* ieee80211_bss_info_change_notify(sdata, ~0); -*/ -if (ieee80211_if_config (sdata, changed)) -printk (KERN_DEBUG "%s: failed to configure interface during resume\n" , - sdata->dev->name); -else -ieee80211_bss_info_change_notify (sdata, ~0 ); +ieee80211_bss_info_change_notify (sdata, changed);break ;case NL80211_IFTYPE_WDS :break ;
drivers/net/wireless/iwlwifi/iwl-agn.c +0 -1
@@ -2543,7 +2543,6 @@ static struct ieee80211_ops iwl_hw_ops = .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl_mac_set_key, .update_tkip_key = iwl_mac_update_tkip_key,
drivers/net/wireless/iwlwifi/iwl-core.c +52 -104
180 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-core.h +0 -3
@@ -281,9 +281,6 @@ void iwl_mac_remove_interface(struct iee struct ieee80211_if_init_conf *conf);int iwl_mac_config (struct ieee80211_hw *hw,u32 changed);void iwl_config_ap (struct iwl_priv *priv); -int iwl_mac_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf);int iwl_mac_get_tx_stats (struct ieee80211_hw *hw,struct ieee80211_tx_queue_stats *stats);void iwl_mac_reset_tsf (struct ieee80211_hw *hw);
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -1
@@ -4016,7 +4016,6 @@ static struct ieee80211_ops iwl3945_hw_o .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl3945_mac_set_key, .get_tx_stats = iwl_mac_get_tx_stats,
drivers/net/wireless/at76c50x-usb.c +9 -6
@@ -1965,13 +1965,18 @@ static int at76_config(struct ieee80211_return 0 ; } -static int at76_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) +static void at76_bss_info_changed (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_bss_conf *conf, +u32 changed) {struct at76_priv *priv = hw->priv;at76_dbg (DBG_MAC80211 ,"%s():" , __func__); + +if (!(changed &BSS_CHANGED_BSSID )) +return ; +at76_dbg_dump (DBG_MAC80211 , conf->bssid,ETH_ALEN ,"bssid:" );mutex_lock (&priv->mtx);
@@ -1983,8 +1988,6 @@ static int at76_config_interface(structat76_join (priv);mutex_unlock (&priv->mtx); - -return 0 ; }/* must be atomic */
@@ -2076,7 +2079,7 @@ static const struct ieee80211_ops at76_o .add_interface = at76_add_interface, .remove_interface = at76_remove_interface, .config = at76_config, - .config_interface = at76_config_interface, + .bss_info_changed = at76_bss_info_changed, .configure_filter = at76_configure_filter, .start = at76_mac80211_start, .stop = at76_mac80211_stop,
drivers/net/wireless/mac80211_hwsim.c +7 -18
@@ -588,23 +588,6 @@ static void mac80211_hwsim_configure_fil *total_flags = data->rx_filter; } -static int mac80211_hwsim_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct hwsim_vif_priv *vp = (void *)vif->drv_priv; - -hwsim_check_magic (vif); -if (conf->changed &IEEE80211_IFCC_BSSID ) { -DECLARE_MAC_BUF (mac); -printk (KERN_DEBUG "%s:%s: BSSID changed: %pM\n" , -wiphy_name (hw->wiphy), __func__, - conf->bssid); -memcpy (vp->bssid, conf->bssid,ETH_ALEN ); - } -return 0 ; -} - static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info,
@@ -618,6 +601,13 @@ static void mac80211_hwsim_bss_info_chanprintk (KERN_DEBUG "%s:%s(changed=0x%x)\n" ,wiphy_name (hw->wiphy), __func__, changed); +if (changed &BSS_CHANGED_BSSID ) { +printk (KERN_DEBUG "%s:%s: BSSID changed: %pM\n" , +wiphy_name (hw->wiphy), __func__, + info->bssid); +memcpy (vp->bssid, info->bssid,ETH_ALEN ); + } +if (changed &BSS_CHANGED_ASSOC ) {printk (KERN_DEBUG " %s: ASSOC: assoc=%d aid=%d\n" ,wiphy_name (hw->wiphy), info->assoc, info->aid);
@@ -709,7 +699,6 @@ static const struct ieee80211_ops mac802 .remove_interface = mac80211_hwsim_remove_interface, .config = mac80211_hwsim_config, .configure_filter = mac80211_hwsim_configure_filter, - .config_interface = mac80211_hwsim_config_interface, .bss_info_changed = mac80211_hwsim_bss_info_changed, .sta_notify = mac80211_hwsim_sta_notify, .set_tim = mac80211_hwsim_set_tim,
drivers/net/wireless/adm8211.c +8 -6
@@ -1311,18 +1311,20 @@ static int adm8211_config(struct ieee802return 0 ; } -static int adm8211_config_interface (struct ieee80211_hw *dev, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) +static void adm8211_bss_info_changed (struct ieee80211_hw *dev, +struct ieee80211_vif *vif, +struct ieee80211_bss_conf *conf, +u32 changes) {struct adm8211_priv *priv = dev->priv; +if (!(changes &BSS_CHANGED_BSSID )) +return ; +if (memcmp (conf->bssid, priv->bssid,ETH_ALEN )) {adm8211_set_bssid (dev, conf->bssid);memcpy (priv->bssid, conf->bssid,ETH_ALEN ); } - -return 0 ; } static void adm8211_configure_filter(struct ieee80211_hw *dev,
@@ -1753,7 +1755,7 @@ static const struct ieee80211_ops adm821 .add_interface = adm8211_add_interface, .remove_interface = adm8211_remove_interface, .config = adm8211_config, - .config_interface = adm8211_config_interface, + .bss_info_changed = adm8211_bss_info_changed, .configure_filter = adm8211_configure_filter, .get_stats = adm8211_get_stats, .get_tx_stats = adm8211_get_tx_stats,
drivers/net/wireless/mwl8k.c +4 -14
@@ -3089,19 +3089,6 @@ static int mwl8k_config(struct ieee80211return rc ? -EINVAL :0 ; } -static int mwl8k_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct mwl8k_vif *mv_vif =MWL8K_VIF (vif); -u32 changed = conf->changed; - -if (changed &IEEE80211_IFCC_BSSID ) -memcpy (mv_vif->bssid, conf->bssid,IEEE80211_ADDR_LEN ); - -return 0 ; -} -struct mwl8k_bss_info_changed_worker {struct mwl8k_work_struct header;struct ieee80211_vif *vif;
@@ -3183,8 +3170,12 @@ static void mwl8k_bss_info_changed(struc {struct mwl8k_bss_info_changed_worker *worker;struct mwl8k_priv *priv = hw->priv; +struct mwl8k_vif *mv_vif =MWL8K_VIF (vif);int rc; +if (changed &BSS_CHANGED_BSSID ) +memcpy (mv_vif->bssid, info->bssid,IEEE80211_ADDR_LEN ); +if ((changed &BSS_CHANGED_ASSOC ) ==0 )return ;
@@ -3442,7 +3433,6 @@ static const struct ieee80211_ops mwl8k_ .add_interface = mwl8k_add_interface, .remove_interface = mwl8k_remove_interface, .config = mwl8k_config, - .config_interface = mwl8k_config_interface, .bss_info_changed = mwl8k_bss_info_changed, .configure_filter = mwl8k_configure_filter, .set_rts_threshold = mwl8k_set_rts_threshold,
drivers/net/wireless/ath/ar9170/main.c +11 -28
@@ -1360,33 +1360,6 @@ out:return err; } -static int ar9170_op_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct ar9170 *ar = hw->priv; -int err =0 ; - -mutex_lock (&ar->mutex); - -if (conf->changed &IEEE80211_IFCC_BSSID ) { -memcpy (ar->bssid, conf->bssid,ETH_ALEN ); - err =ar9170_set_operating_mode (ar); - } - -if (conf->changed &IEEE80211_IFCC_BEACON ) { - err =ar9170_update_beacon (ar); - -if (err) - goto out; - err =ar9170_set_beacon_timers (ar); - } - -out: -mutex_unlock (&ar->mutex); -return err; -} -static void ar9170_set_filters (struct work_struct *work) { struct ar9170 *ar = container_of(work, struct ar9170,
@@ -1488,6 +1461,17 @@ static void ar9170_op_bss_info_changed(smutex_lock (&ar->mutex); +if (changed &BSS_CHANGED_BSSID ) { +memcpy (ar->bssid, bss_conf->bssid,ETH_ALEN ); + err =ar9170_set_operating_mode (ar); + } + +if (changed & (BSS_CHANGED_BEACON |BSS_CHANGED_BEACON_ENABLED )) { + err =ar9170_update_beacon (ar); +if (!err) +ar9170_set_beacon_timers (ar); + } +ar9170_regwrite_begin (ar);if (changed &BSS_CHANGED_ASSOC ) {
@@ -1796,7 +1780,6 @@ static const struct ieee80211_ops ar9170 .add_interface = ar9170_op_add_interface, .remove_interface = ar9170_op_remove_interface, .config = ar9170_op_config, - .config_interface = ar9170_op_config_interface, .configure_filter = ar9170_op_configure_filter, .conf_tx = ar9170_conf_tx, .bss_info_changed = ar9170_op_bss_info_changed,
drivers/net/wireless/ath/ath5k/base.c +27 -44
102 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/main.c +83 -99
203 lines not on this page · raw message
drivers/net/wireless/b43/main.c +26 -38
94 lines not on this page · raw message
drivers/net/wireless/b43legacy/main.c +24 -39
93 lines not on this page · raw message
drivers/net/wireless/libertas_tf/main.c +23 -33
80 lines not on this page · raw message
drivers/net/wireless/p54/p54common.c +25 -38
88 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2x00.h +0 -3
@@ -943,9 +943,6 @@ int rt2x00mac_add_interface(struct ieee8void rt2x00mac_remove_interface (struct ieee80211_hw *hw,struct ieee80211_if_init_conf *conf);int rt2x00mac_config (struct ieee80211_hw *hw,u32 changed); -int rt2x00mac_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf); void rt2x00mac_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *total_flags,
drivers/net/wireless/rt2x00/rt2x00mac.c +38 -50
100 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2400pci.c +0 -1
@@ -1580,7 +1580,6 @@ static const struct ieee80211_ops rt2400 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .get_stats = rt2x00mac_get_stats, .bss_info_changed = rt2x00mac_bss_info_changed,
drivers/net/wireless/rt2x00/rt2500pci.c +0 -1
@@ -1879,7 +1879,6 @@ static const struct ieee80211_ops rt2500 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .get_stats = rt2x00mac_get_stats, .bss_info_changed = rt2x00mac_bss_info_changed,
drivers/net/wireless/rt2x00/rt2500usb.c +0 -1
@@ -1908,7 +1908,6 @@ static const struct ieee80211_ops rt2500 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rt2x00/rt61pci.c +0 -1
@@ -2735,7 +2735,6 @@ static const struct ieee80211_ops rt61pc .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rt2x00/rt73usb.c +0 -1
@@ -2259,7 +2259,6 @@ static const struct ieee80211_ops rt73us .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rtl818x/rtl8180_dev.c +14 -19
@@ -702,30 +702,26 @@ static int rtl8180_config(struct ieee802return 0 ; } -static int rtl8180_config_interface (struct ieee80211_hw *dev, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct rtl8180_priv *priv = dev->priv; -int i; - -for (i =0 ; i <ETH_ALEN ; i++) -rtl818x_iowrite8 (priv, &priv->map->BSSID[i], conf->bssid[i]); - -if (is_valid_ether_addr (conf->bssid)) -rtl818x_iowrite8 (priv, &priv->map->MSR,RTL818X_MSR_INFRA ); -else -rtl818x_iowrite8 (priv, &priv->map->MSR,RTL818X_MSR_NO_LINK ); - -return 0 ; -} -static void rtl8180_bss_info_changed (struct ieee80211_hw *dev,struct ieee80211_vif *vif,struct ieee80211_bss_conf *info,u32 changed) {struct rtl8180_priv *priv = dev->priv; +int i; + +if (changed &BSS_CHANGED_BSSID ) { +for (i =0 ; i <ETH_ALEN ; i++) +rtl818x_iowrite8 (priv, &priv->map->BSSID[i], + info->bssid[i]); + +if (is_valid_ether_addr (info->bssid)) +rtl818x_iowrite8 (priv, &priv->map->MSR, +RTL818X_MSR_INFRA ); +else +rtl818x_iowrite8 (priv, &priv->map->MSR, +RTL818X_MSR_NO_LINK ); + }if (changed &BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp) priv->rf->conf_erp (dev, info);
@@ -770,7 +766,6 @@ static const struct ieee80211_ops rtl818 .add_interface = rtl8180_add_interface, .remove_interface = rtl8180_remove_interface, .config = rtl8180_config, - .config_interface = rtl8180_config_interface, .bss_info_changed = rtl8180_bss_info_changed, .configure_filter = rtl8180_configure_filter, };
drivers/net/wireless/rtl818x/rtl8187_dev.c +21 -27
66 lines not on this page · raw message
drivers/net/wireless/zd1211rw/zd_mac.c +33 -47
101 lines not on this page · raw message
Re: [RFC 2/2] mac80211: unify config_interface and bss_info_changed
Hi Johannes,
Quoted 9 lines · Johannes Berg
The
config_interfacemethod is a little strange, it contains the BSSID and beacon updates, whilebss_info_changedcontains most other BSS information for each interface. This patch removesconfig_interfaceand rolls all the information it previously passed to drivers intobss_info_changed.Signed-off-by Johannes Berg <[email protected]>---
Tested with ar9170, zd1211, p54 and iwlagn.
Thank you very much for testing it.
[...]
Quoted 55 lines
drivers/net/wireless/iwlwifi/iwl-agn.c 2009-04-22 15:56:29.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-agn.c 2009-04-22 15:56:25.000000000 +0200 +0
-1@@ -2543,7 +2543,6 @@ static struct ieee80211_ops iwl_hw_ops = .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl_mac_set_key, .update_tkip_key = iwl_mac_update_tkip_key,drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +30
-3@@ -2231,15 +2231,63 @@ static void iwl_ht_conf(struct iwl_priv #define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6) void iwl_bss_info_changed(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - struct ieee80211_bss_conf *bss_conf, - u32 changes) + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *bss_conf, + u32 changes) { struct iwl_priv *priv = hw->priv; int ret; IWL_DEBUG_MAC80211(priv, "changes = 0x%X\n", changes); + if (!iwl_is_alive(priv)) + return; + + mutex_lock(&priv->mutex); + + if ((changes & BSS_CHANGED_BSSID) && !iwl_is_rfkill(priv)) { + /* If there is currently a HW scan going on in the background + * then we need to cancel it else the RXON below will fail. */ + if (iwl_scan_cancel_timeout(priv, 100)) { + IWL_WARN(priv, "Aborted scan still in progress " + "after 100ms\n"); + IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n"); + mutex_unlock(&priv->mutex); + return; + } + memcpy(priv->staging_rxon.bssid_addr, + bss_conf->bssid, ETH_ALEN); + + /* TODO: Audit driver for usage of these members and see + * if mac80211 deprecates them (priv->bssid looks like it + * shouldn't be there, but I haven't scanned the IBSS code + * to verify) - jpk */ + memcpy(priv->bssid, bss_conf->bssid, ETH_ALEN); + + if (priv->iw_mode == NL80211_IFTYPE_AP) + iwlcore_config_ap(priv); + else {
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 static void iwl_ht_conf(struct iwl_priv · line 2279
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +10
-0+ int rc = iwlcore_commit_rxon(priv); + if ((priv->iw_mode == NL80211_IFTYPE_STATION) && rc) + iwl_rxon_add_station( + priv, priv->active_rxon.bssid_addr, 1); + } + } else { + iwl_scan_cancel_timeout(priv, 100); + priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; + iwlcore_commit_rxon(priv); + }
I do not think the above if clause fully captures what was done in iwl_mac_config_interface(). If rfkill is enabled we do not want to send a command to the device. This is possible in this else clause. Perhaps the else can have an extra check like ...
...
} else if (!iwl_is_rfkill(priv)) {
...
Quoted 15 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +11
-0+ + if (priv->iw_mode == NL80211_IFTYPE_ADHOC && + changes & BSS_CHANGED_BEACON) { + struct sk_buff *beacon = ieee80211_beacon_get(hw, vif); + + if (beacon) + iwl_mac_beacon_update(hw, beacon); + } + + mutex_unlock(&priv->mutex); + if (changes & BSS_CHANGED_ERP_PREAMBLE) { IWL_DEBUG_MAC80211(priv, "ERP_PREAMBLE %d\n", bss_conf->use_short_preamble);
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 void iwl_bss_info_changed(struct ieee802 · line 2348
Quoted 5 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +1
-1@@ -2297,7 +2345,7 @@ void iwl_bss_info_changed(struct ieee802 &priv->staging_rxon, sizeof(struct iwl_rxon_cmd)); } - + IWL_DEBUG_MAC80211(priv, "leave\n");
Why did you choose not to copy the code dealing with AP mode from iwl_mac_config_interface()? I know that the driver does not currently support it, but removing this code makes it harder for the case if this support is added back. Considering the code is not currently used, would you be ok with adding it as commented code?
Quoted 51 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +0
-44} EXPORT_SYMBOL(iwl_bss_info_changed);@@ -2578,106 +2626,6 @@ out: } EXPORT_SYMBOL(iwl_mac_config); -int iwl_mac_config_interface(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - struct ieee80211_if_conf *conf) -{ - struct iwl_priv *priv = hw->priv; - int rc; - - if (conf == NULL) - return -EIO; - - if (priv->vif != vif) { - IWL_DEBUG_MAC80211(priv, "leave - priv->vif != vif\n"); - return 0; - } - - if (priv->iw_mode == NL80211_IFTYPE_ADHOC && - conf->changed & IEEE80211_IFCC_BEACON) { - struct sk_buff *beacon = ieee80211_beacon_get(hw, vif); - if (!beacon) - return -ENOMEM; - mutex_lock(&priv->mutex); - rc = iwl_mac_beacon_update(hw, beacon); - mutex_unlock(&priv->mutex); - if (rc) - return rc; - } - - if (!iwl_is_alive(priv)) - return -EAGAIN; - - mutex_lock(&priv->mutex); - - if (conf->bssid) - IWL_DEBUG_MAC80211(priv, "bssid: %pM\n", conf->bssid); - -/* - * very dubious code was here; the probe filtering flag is never set: - * - if (unlikely(test_bit(STATUS_SCANNING, &priv->status)) && - !(priv->hw->flags & IEEE80211_HW_NO_PROBE_FILTERING)) { - */ - - if (priv->iw_mode == NL80211_IFTYPE_AP) { - if (!conf->bssid) {
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 out: · line 2634
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +0
-10- conf->bssid = priv->mac_addr; - memcpy(priv->bssid, priv->mac_addr, ETH_ALEN); - IWL_DEBUG_MAC80211(priv, "bssid was set to: %pM\n", - conf->bssid); - } - if (priv->ibss_beacon) - dev_kfree_skb(priv->ibss_beacon); - - priv->ibss_beacon = ieee80211_beacon_get(hw, vif); - }
This is the AP code I refer to above ...
Quoted 64 lines
drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 17:38:00.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.c 2009-04-22 15:56:48.000000000 +0200 +0
-46- - if (iwl_is_rfkill(priv)) - goto done; - - if (conf->bssid && !is_zero_ether_addr(conf->bssid) && - !is_multicast_ether_addr(conf->bssid)) { - /* If there is currently a HW scan going on in the background - * then we need to cancel it else the RXON below will fail. */ - if (iwl_scan_cancel_timeout(priv, 100)) { - IWL_WARN(priv, "Aborted scan still in progress " - "after 100ms\n"); - IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n"); - mutex_unlock(&priv->mutex); - return -EAGAIN; - } - memcpy(priv->staging_rxon.bssid_addr, conf->bssid, ETH_ALEN); - - /* TODO: Audit driver for usage of these members and see - * if mac80211 deprecates them (priv->bssid looks like it - * shouldn't be there, but I haven't scanned the IBSS code - * to verify) - jpk */ - memcpy(priv->bssid, conf->bssid, ETH_ALEN); - - if (priv->iw_mode == NL80211_IFTYPE_AP) - iwlcore_config_ap(priv); - else { - rc = iwlcore_commit_rxon(priv); - if ((priv->iw_mode == NL80211_IFTYPE_STATION) && rc) - iwl_rxon_add_station( - priv, priv->active_rxon.bssid_addr, 1); - } - - } else { - iwl_scan_cancel_timeout(priv, 100); - priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK; - iwlcore_commit_rxon(priv); - } - - done: - IWL_DEBUG_MAC80211(priv, "leave\n"); - mutex_unlock(&priv->mutex); - - return 0; -} -EXPORT_SYMBOL(iwl_mac_config_interface); - int iwl_mac_get_tx_stats(struct ieee80211_hw *hw, struct ieee80211_tx_queue_stats *stats) {drivers/net/wireless/iwlwifi/iwl-core.h 2009-04-22 15:55:53.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl-core.h 2009-04-22 15:55:47.000000000 +0200 +0
-3@@ -281,9 +281,6 @@ void iwl_mac_remove_interface(struct iee struct ieee80211_if_init_conf *conf); int iwl_mac_config(struct ieee80211_hw *hw, u32 changed); void iwl_config_ap(struct iwl_priv *priv); -int iwl_mac_config_interface(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - struct ieee80211_if_conf *conf); int iwl_mac_get_tx_stats(struct ieee80211_hw *hw, struct ieee80211_tx_queue_stats *stats); void iwl_mac_reset_tsf(struct ieee80211_hw *hw);
drivers/net/wireless/iwlwifi/iwl3945-base.c 2009-04-22 15:56:07.000000000 +0200 static struct ieee80211_ops iwl3945_hw_o · line 4021
Quoted 7 lines
drivers/net/wireless/iwlwifi/iwl3945-base.c 2009-04-22 15:56:07.000000000 +0200 renamed from drivers/net/wireless/iwlwifi/iwl3945-base.c 2009-04-22 15:56:02.000000000 +0200 +0
-1@@ -4016,7 +4016,6 @@ static struct ieee80211_ops iwl3945_hw_o .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl3945_mac_set_key, .get_tx_stats = iwl_mac_get_tx_stats,
Reinette
Johannes Berg
maintainerRe: [RFC 2/2] mac80211: unify config_interface and bss_info_changed
Hi Reinette,
Thanks for your comments!
Quoted 57 lines
Quoted 41 lines
#define
IWL_DELAY_NEXT_SCAN_AFTER_ASSOC(HZ*6) void iwl_bss_info_changed(structieee80211_hw*hw,drivers/net/wireless/iwlwifi/iwl-core.c +30
-3-struct ieee80211_vif *vif, - struct ieee80211_bss_conf *bss_conf, - u32 changes) +struct ieee80211_vif *vif, + struct ieee80211_bss_conf *bss_conf, + u32 changes) { struct iwl_priv *priv = hw->priv;int ret;IWL_DEBUG_MAC80211 (priv,"changes = 0x%X\n" , changes); +if (!iwl_is_alive (priv)) +return ; + +mutex_lock (&priv->mutex); + +if ((changes &BSS_CHANGED_BSSID ) && !iwl_is_rfkill (priv)) { +/* If there is currently a HW scan going on in the background +* then we need to cancel it else the RXON below will fail. */ +if (iwl_scan_cancel_timeout (priv,100 )) { +IWL_WARN (priv,"Aborted scan still in progress " +"after 100ms\n" ); +IWL_DEBUG_MAC80211 (priv,"leaving - scan abort failed.\n" ); +mutex_unlock (&priv->mutex); +return ; + } +memcpy (priv->staging_rxon.bssid_addr, + bss_conf->bssid,ETH_ALEN ); + +/* TODO: Audit driver for usage of these members and see +* if mac80211 deprecates them (priv->bssid looks like it +* shouldn't be there, but I haven't scanned the IBSS code +* to verify) - jpk */ +memcpy (priv->bssid, bss_conf->bssid,ETH_ALEN ); + +if (priv->iw_mode ==NL80211_IFTYPE_AP ) +iwlcore_config_ap (priv); +else {drivers/net/wireless/iwlwifi/iwl-core.c static void iwl_ht_conf(struct iwl_priv · line 2279
Quoted 10 lines
drivers/net/wireless/iwlwifi/iwl-core.c +10
-0+int rc =iwlcore_commit_rxon (priv); +if ((priv->iw_mode ==NL80211_IFTYPE_STATION ) && rc) +iwl_rxon_add_station ( + priv, priv->active_rxon.bssid_addr,1 ); + } + }else { +iwl_scan_cancel_timeout (priv,100 ); + priv->staging_rxon.filter_flags &= ~RXON_FILTER_ASSOC_MSK ; +iwlcore_commit_rxon (priv); + }I do not think the above if clause fully captures what was done in
iwl_mac_config_interface(). If rfkill is enabled we do not want to send a command to the device. This is possible in this else clause. Perhaps the else can have an extra check like ...
Quoted 3 lines
...
} else if (!iwl_is_rfkill(priv)) {
...
Oh indeed. That looks like a bug. The entire thing was rather odd -- I first had the code below the rest of bss_info_changed and then it just didn't work at all. Seems iwlwifi implicitly relied on an undocumented call ordering in mac80211 :)
Quoted 5 lines
Why did you choose not to copy the code dealing with AP mode from
iwl_mac_config_interface()? I know that the driver does not currently support it, but removing this code makes it harder for the case if this support is added back. Considering the code is not currently used, would you be ok with adding it as commented code?
Sure. It was just that I looked at the code:
Quoted 4 lines
Quoted 4 lines
drivers/net/wireless/iwlwifi/iwl-core.c +0
-4-if (priv->iw_mode ==NL80211_IFTYPE_AP ) { -if (!conf->bssid) { - conf->bssid = priv->mac_addr; -memcpy (priv->bssid, priv->mac_addr,ETH_ALEN );
Quoted 8 lines
drivers/net/wireless/iwlwifi/iwl-core.c out: · line 2634
Quoted 8 lines
drivers/net/wireless/iwlwifi/iwl-core.c +0
-8-IWL_DEBUG_MAC80211 (priv,"bssid was set to: %pM\n" , - conf->bssid); - } -if (priv->ibss_beacon) -dev_kfree_skb (priv->ibss_beacon); - - priv->ibss_beacon =ieee80211_beacon_get (hw, vif); - }
and it didn't seem to make any sense to me. ibss_beacon? Also, it doesn't depend on configuration that the beacon changed? Either way, I can add the code back, maybe with a small cleanup.
Thanks,
johannes
Johannes Berg
maintainerRFC v2 2/2 mac80211: unify config_interface and bss_info_changed
In reply to reinette chatreThe config_interface method is a little strange, it contains the BSSID and beacon updates, while bss_info_changed contains most other BSS information for each interface. This patch removes config_interface and rolls all the information it previously passed to drivers into bss_info_changed.
---
Tested with ar9170, zd1211, p54 and iwlagn.
v2: Address Reinette's comments -- the code in question can be
simplified a lot because dev_kfree_skb() can take NULL and conf->bssid is never NULL these days.
drivers/net/wireless/adm8211.c | 14 +- drivers/net/wireless/at76c50x-usb.c | 15 +- drivers/net/wireless/ath/ar9170/main.c | 39 +----- drivers/net/wireless/ath/ath5k/base.c | 71 ++++------ drivers/net/wireless/ath/ath9k/main.c | 182 ++++++++++++---------------- drivers/net/wireless/b43/main.c | 64 ++++----- drivers/net/wireless/b43legacy/main.c | 63 +++------ drivers/net/wireless/iwlwifi/iwl-agn.c | 1 drivers/net/wireless/iwlwifi/iwl-core.c | 162 ++++++++---------------- drivers/net/wireless/iwlwifi/iwl-core.h | 3 drivers/net/wireless/iwlwifi/iwl3945-base.c | 1 drivers/net/wireless/libertas_tf/main.c | 56 +++----- drivers/net/wireless/mac80211_hwsim.c | 25 +-- drivers/net/wireless/mwl8k.c | 18 -- drivers/net/wireless/p54/p54common.c | 63 +++------ drivers/net/wireless/rt2x00/rt2400pci.c | 1 drivers/net/wireless/rt2x00/rt2500pci.c | 1 drivers/net/wireless/rt2x00/rt2500usb.c | 1 drivers/net/wireless/rt2x00/rt2x00.h | 3 drivers/net/wireless/rt2x00/rt2x00mac.c | 88 +++++-------- drivers/net/wireless/rt2x00/rt61pci.c | 1 drivers/net/wireless/rt2x00/rt73usb.c | 1 drivers/net/wireless/rtl818x/rtl8180_dev.c | 33 ++--- drivers/net/wireless/rtl818x/rtl8187_dev.c | 48 +++---- drivers/net/wireless/zd1211rw/zd_mac.c | 80 +++++------- include/net/mac80211.h | 51 ++----- net/mac80211/cfg.c | 8 - net/mac80211/ibss.c | 18 +- net/mac80211/ieee80211_i.h | 1 net/mac80211/main.c | 131 ++++++++------------ net/mac80211/mesh.c | 6 net/mac80211/mlme.c | 8 - net/mac80211/scan.c | 8 - net/mac80211/util.c | 17 -- 34 files changed, 504 insertions(+), 778 deletions(-)
include/net/mac80211.h +13 -38
@@ -150,6 +150,12 @@ struct ieee80211_low_level_stats {* @BSS_CHANGED_HT: 802.11n parameters changed * @BSS_CHANGED_BASIC_RATES: Basic rateset changed * @BSS_CHANGED_BEACON_INT: Beacon interval changed +* @BSS_CHANGED_BSSID: BSSID changed, for whatever +* reason (IBSS and managed mode) +* @BSS_CHANGED_BEACON: Beacon data changed, retrieve +* new beacon (beaconing modes) +* @BSS_CHANGED_BEACON_ENABLED: Beaconing should be +* enabled/disabled (beaconing modes) */ enum ieee80211_bss_change {BSS_CHANGED_ASSOC =1 <<0 ,
@@ -159,6 +165,9 @@ enum ieee80211_bss_change {BSS_CHANGED_HT =1 <<4 ,BSS_CHANGED_BASIC_RATES =1 <<5 ,BSS_CHANGED_BEACON_INT =1 <<6 , +BSS_CHANGED_BSSID =1 <<7 , +BSS_CHANGED_BEACON =1 <<8 , + BSS_CHANGED_BEACON_ENABLED = 1<<9, };/**
@@ -192,8 +201,11 @@ struct ieee80211_bss_ht_conf {* @basic_rates: bitmap of basic rates, each bit stands for an * index into the rate table configured by the driver in * the current band. +* @bssid: The BSSID for this BSS +* @enable_beacon: whether beaconing should be enabled or not */ struct ieee80211_bss_conf { +const u8 *bssid;/* association related data */ bool assoc;u16 aid;
@@ -201,6 +213,7 @@ struct ieee80211_bss_conf {bool use_cts_prot;bool use_short_preamble;bool use_short_slot; +bool enable_beacon;u8 dtim_period;u16 beacon_int;u16 assoc_capability;
@@ -652,37 +665,6 @@ struct ieee80211_if_init_conf { };/** -* enum ieee80211_if_conf_change - interface config change flags -* -* @IEEE80211_IFCC_BSSID: The BSSID changed. -* @IEEE80211_IFCC_BEACON: The beacon for this interface changed -* (currently AP and MESH only), use ieee80211_beacon_get(). -* @IEEE80211_IFCC_BEACON_ENABLED: The enable_beacon value changed. -*/ -enum ieee80211_if_conf_change { -IEEE80211_IFCC_BSSID =BIT (0 ), -IEEE80211_IFCC_BEACON =BIT (1 ), -IEEE80211_IFCC_BEACON_ENABLED =BIT (2 ), -}; - -/** -* struct ieee80211_if_conf - configuration of an interface -* -* @changed: parameters that have changed, see &enum ieee80211_if_conf_change. -* @bssid: BSSID of the network we are associated to/creating. -* @enable_beacon: Indicates whether beacons can be sent. -* This is valid only for AP/IBSS/MESH modes. -* -* This structure is passed to the config_interface() callback of -* &struct ieee80211_hw. -*/ -struct ieee80211_if_conf { -u32 changed; -const u8 *bssid; -bool enable_beacon; -}; - -/** * enum ieee80211_key_alg - key algorithm * @ALG_WEP: WEP40 or WEP104 * @ALG_TKIP: TKIP
@@ -1350,10 +1332,6 @@ enum ieee80211_ampdu_mlme_action {* This function should never fail but returns a negative error code * if it does. * -* @config_interface: Handler for configuration requests related to interfaces -* (e.g. BSSID changes.) -* Returns a negative error code which will be seen in userspace. -* * @bss_info_changed: Handler for configuration requests related to BSS * parameters that may vary during BSS's lifespan, and may affect low * level driver (e.g. assoc/disassoc status, erp parameters).
@@ -1455,9 +1433,6 @@ struct ieee80211_ops {void (*remove_interface)(struct ieee80211_hw *hw,struct ieee80211_if_init_conf *conf);int (*config)(struct ieee80211_hw *hw,u32 changed); -int (*config_interface)(struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf); void (*bss_info_changed)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info,
net/mac80211/ibss.c +8 -10
@@ -95,17 +95,10 @@ static void __ieee80211_sta_join_ibss(st sdata->drop_unencrypted = capability &WLAN_CAPABILITY_PRIVACY ?1 :0 ; -ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID ); - local->oper_channel = chan; local->oper_channel_type =NL80211_CHAN_NO_HT ;ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_CHANNEL ); - sdata->vif.bss_conf.beacon_int = beacon_int; - bss_change =BSS_CHANGED_BEACON_INT ; - bss_change |=ieee80211_reset_erp_info (sdata); -ieee80211_bss_info_change_notify (sdata, bss_change); - sband = local->hw.wiphy->bands[chan->band];/* Build IBSS probe response */
@@ -161,8 +154,13 @@ static void __ieee80211_sta_join_ibss(strcu_assign_pointer (ifibss->presp, skb); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); + sdata->vif.bss_conf.beacon_int = beacon_int; + bss_change =BSS_CHANGED_BEACON_INT ; + bss_change |=ieee80211_reset_erp_info (sdata); + bss_change |=BSS_CHANGED_BSSID ; + bss_change |=BSS_CHANGED_BEACON ; + bss_change |=BSS_CHANGED_BEACON_ENABLED ; +ieee80211_bss_info_change_notify (sdata, bss_change); rates =0 ;for (i =0 ; i < supp_rates_len; i++) {
@@ -889,7 +887,7 @@ int ieee80211_ibss_leave(struct ieee8021kfree (sdata->u.ibss.ie); skb = sdata->u.ibss.presp;rcu_assign_pointer (sdata->u.ibss.presp,NULL ); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED );synchronize_rcu ();kfree_skb (skb);
net/mac80211/ieee80211_i.h +0 -1
@@ -905,7 +905,6 @@ static inline int ieee80211_bssid_match(int ieee80211_hw_config (struct ieee80211_local *local,u32 changed); -int ieee80211_if_config (struct ieee80211_sub_if_data *sdata,u32 changed);void ieee80211_tx_set_protected (struct ieee80211_tx_data *tx);void ieee80211_bss_info_change_notify (struct ieee80211_sub_if_data *sdata,u32 changed);
net/mac80211/main.c +55 -76
143 lines not on this page · raw message
net/mac80211/mlme.c +2 -6
@@ -2299,12 +2299,8 @@ int ieee80211_sta_set_bssid(struct ieee8 ifmgd->flags &= ~IEEE80211_STA_BSSID_SET ; } -if (netif_running (sdata->dev)) { -if (ieee80211_if_config (sdata,IEEE80211_IFCC_BSSID )) { -printk (KERN_DEBUG "%s: Failed to config new BSSID to " -"the low-level driver\n" , sdata->dev->name); - } - } +if (netif_running (sdata->dev)) +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BSSID );return ieee80211_sta_commit (sdata); }
net/mac80211/scan.c +4 -4
@@ -342,8 +342,8 @@ void ieee80211_scan_completed(struct ieeif (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_ADHOC || sdata->vif.type ==NL80211_IFTYPE_MESH_POINT ) -ieee80211_if_config (sdata, -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify ( + sdata,BSS_CHANGED_BEACON_ENABLED ); }mutex_unlock (&local->iflist_mtx);
@@ -515,8 +515,8 @@ int ieee80211_start_scan(struct ieee8021if (sdata->vif.type ==NL80211_IFTYPE_AP || sdata->vif.type ==NL80211_IFTYPE_ADHOC || sdata->vif.type ==NL80211_IFTYPE_MESH_POINT ) -ieee80211_if_config (sdata, -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify ( + sdata,BSS_CHANGED_BEACON_ENABLED );if (sdata->vif.type ==NL80211_IFTYPE_STATION ) {if (sdata->u.mgd.flags &IEEE80211_STA_ASSOCIATED ) {
net/mac80211/cfg.c +5 -3
@@ -521,8 +521,9 @@ static int ieee80211_config_beacon(struckfree (old); -return ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED | +BSS_CHANGED_BEACON ); +return 0 ; } static int ieee80211_add_beacon(struct wiphy *wiphy, struct net_device *dev,
@@ -573,7 +574,8 @@ static int ieee80211_del_beacon(struct wsynchronize_rcu ();kfree (old); -return ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON_ENABLED ); +return 0 ; }/* Layer 2 Update frame (802.2 Type 1 LLC XID Update response) */
net/mac80211/mesh.c +3 -3
@@ -417,7 +417,7 @@ static void ieee80211_mesh_housekeeping( free_plinks =mesh_plink_availables (sdata);if (free_plinks != sdata->u.mesh.accepting_plinks) -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON ); ifmsh->housekeeping = false; mod_timer(&ifmsh->housekeeping_timer,
@@ -432,8 +432,8 @@ void ieee80211_start_mesh(struct ieee802 ifmsh->housekeeping = true;queue_work (local->hw.workqueue, &ifmsh->work); -ieee80211_if_config (sdata,IEEE80211_IFCC_BEACON | -IEEE80211_IFCC_BEACON_ENABLED ); +ieee80211_bss_info_change_notify (sdata,BSS_CHANGED_BEACON | +BSS_CHANGED_BEACON_ENABLED ); }void ieee80211_stop_mesh (struct ieee80211_sub_if_data *sdata)
net/mac80211/util.c +3 -14
@@ -1063,24 +1063,13 @@ int ieee80211_reconfig(struct ieee80211_switch (sdata->vif.type) {case NL80211_IFTYPE_STATION :/* disable beacon change bits */ - changed &= ~IEEE80211_IFCC_BEACON ; + changed &= ~(BSS_CHANGED_BEACON | +BSS_CHANGED_BEACON_ENABLED );/* fall through */ case NL80211_IFTYPE_ADHOC :case NL80211_IFTYPE_AP :case NL80211_IFTYPE_MESH_POINT : -/* -* Driver's config_interface can fail if rfkill is -* enabled. Accommodate this return code. -* FIXME: When mac80211 has knowledge of rfkill -* state the code below can change back to: -* WARN(ieee80211_if_config(sdata, changed)); -* ieee80211_bss_info_change_notify(sdata, ~0); -*/ -if (ieee80211_if_config (sdata, changed)) -printk (KERN_DEBUG "%s: failed to configure interface during resume\n" , - sdata->dev->name); -else -ieee80211_bss_info_change_notify (sdata, ~0 ); +ieee80211_bss_info_change_notify (sdata, changed);break ;case NL80211_IFTYPE_WDS :break ;
drivers/net/wireless/iwlwifi/iwl-agn.c +0 -1
@@ -2543,7 +2543,6 @@ static struct ieee80211_ops iwl_hw_ops = .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl_mac_set_key, .update_tkip_key = iwl_mac_update_tkip_key,
drivers/net/wireless/iwlwifi/iwl-core.c +58 -104
186 lines not on this page · raw message
drivers/net/wireless/iwlwifi/iwl-core.h +0 -3
@@ -281,9 +281,6 @@ void iwl_mac_remove_interface(struct iee struct ieee80211_if_init_conf *conf);int iwl_mac_config (struct ieee80211_hw *hw,u32 changed);void iwl_config_ap (struct iwl_priv *priv); -int iwl_mac_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf);int iwl_mac_get_tx_stats (struct ieee80211_hw *hw,struct ieee80211_tx_queue_stats *stats);void iwl_mac_reset_tsf (struct ieee80211_hw *hw);
drivers/net/wireless/iwlwifi/iwl3945-base.c +0 -1
@@ -4016,7 +4016,6 @@ static struct ieee80211_ops iwl3945_hw_o .add_interface = iwl_mac_add_interface, .remove_interface = iwl_mac_remove_interface, .config = iwl_mac_config, - .config_interface = iwl_mac_config_interface, .configure_filter = iwl_configure_filter, .set_key = iwl3945_mac_set_key, .get_tx_stats = iwl_mac_get_tx_stats,
drivers/net/wireless/at76c50x-usb.c +9 -6
@@ -1965,13 +1965,18 @@ static int at76_config(struct ieee80211_return 0 ; } -static int at76_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) +static void at76_bss_info_changed (struct ieee80211_hw *hw, +struct ieee80211_vif *vif, +struct ieee80211_bss_conf *conf, +u32 changed) {struct at76_priv *priv = hw->priv;at76_dbg (DBG_MAC80211 ,"%s():" , __func__); + +if (!(changed &BSS_CHANGED_BSSID )) +return ; +at76_dbg_dump (DBG_MAC80211 , conf->bssid,ETH_ALEN ,"bssid:" );mutex_lock (&priv->mtx);
@@ -1983,8 +1988,6 @@ static int at76_config_interface(structat76_join (priv);mutex_unlock (&priv->mtx); - -return 0 ; }/* must be atomic */
@@ -2076,7 +2079,7 @@ static const struct ieee80211_ops at76_o .add_interface = at76_add_interface, .remove_interface = at76_remove_interface, .config = at76_config, - .config_interface = at76_config_interface, + .bss_info_changed = at76_bss_info_changed, .configure_filter = at76_configure_filter, .start = at76_mac80211_start, .stop = at76_mac80211_stop,
drivers/net/wireless/mac80211_hwsim.c +7 -18
@@ -588,23 +588,6 @@ static void mac80211_hwsim_configure_fil *total_flags = data->rx_filter; } -static int mac80211_hwsim_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct hwsim_vif_priv *vp = (void *)vif->drv_priv; - -hwsim_check_magic (vif); -if (conf->changed &IEEE80211_IFCC_BSSID ) { -DECLARE_MAC_BUF (mac); -printk (KERN_DEBUG "%s:%s: BSSID changed: %pM\n" , -wiphy_name (hw->wiphy), __func__, - conf->bssid); -memcpy (vp->bssid, conf->bssid,ETH_ALEN ); - } -return 0 ; -} - static void mac80211_hwsim_bss_info_changed(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *info,
@@ -618,6 +601,13 @@ static void mac80211_hwsim_bss_info_chanprintk (KERN_DEBUG "%s:%s(changed=0x%x)\n" ,wiphy_name (hw->wiphy), __func__, changed); +if (changed &BSS_CHANGED_BSSID ) { +printk (KERN_DEBUG "%s:%s: BSSID changed: %pM\n" , +wiphy_name (hw->wiphy), __func__, + info->bssid); +memcpy (vp->bssid, info->bssid,ETH_ALEN ); + } +if (changed &BSS_CHANGED_ASSOC ) {printk (KERN_DEBUG " %s: ASSOC: assoc=%d aid=%d\n" ,wiphy_name (hw->wiphy), info->assoc, info->aid);
@@ -709,7 +699,6 @@ static const struct ieee80211_ops mac802 .remove_interface = mac80211_hwsim_remove_interface, .config = mac80211_hwsim_config, .configure_filter = mac80211_hwsim_configure_filter, - .config_interface = mac80211_hwsim_config_interface, .bss_info_changed = mac80211_hwsim_bss_info_changed, .sta_notify = mac80211_hwsim_sta_notify, .set_tim = mac80211_hwsim_set_tim,
drivers/net/wireless/adm8211.c +8 -6
@@ -1311,18 +1311,20 @@ static int adm8211_config(struct ieee802return 0 ; } -static int adm8211_config_interface (struct ieee80211_hw *dev, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) +static void adm8211_bss_info_changed (struct ieee80211_hw *dev, +struct ieee80211_vif *vif, +struct ieee80211_bss_conf *conf, +u32 changes) {struct adm8211_priv *priv = dev->priv; +if (!(changes &BSS_CHANGED_BSSID )) +return ; +if (memcmp (conf->bssid, priv->bssid,ETH_ALEN )) {adm8211_set_bssid (dev, conf->bssid);memcpy (priv->bssid, conf->bssid,ETH_ALEN ); } - -return 0 ; } static void adm8211_configure_filter(struct ieee80211_hw *dev,
@@ -1753,7 +1755,7 @@ static const struct ieee80211_ops adm821 .add_interface = adm8211_add_interface, .remove_interface = adm8211_remove_interface, .config = adm8211_config, - .config_interface = adm8211_config_interface, + .bss_info_changed = adm8211_bss_info_changed, .configure_filter = adm8211_configure_filter, .get_stats = adm8211_get_stats, .get_tx_stats = adm8211_get_tx_stats,
drivers/net/wireless/mwl8k.c +4 -14
@@ -3089,19 +3089,6 @@ static int mwl8k_config(struct ieee80211return rc ? -EINVAL :0 ; } -static int mwl8k_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct mwl8k_vif *mv_vif =MWL8K_VIF (vif); -u32 changed = conf->changed; - -if (changed &IEEE80211_IFCC_BSSID ) -memcpy (mv_vif->bssid, conf->bssid,IEEE80211_ADDR_LEN ); - -return 0 ; -} -struct mwl8k_bss_info_changed_worker {struct mwl8k_work_struct header;struct ieee80211_vif *vif;
@@ -3183,8 +3170,12 @@ static void mwl8k_bss_info_changed(struc {struct mwl8k_bss_info_changed_worker *worker;struct mwl8k_priv *priv = hw->priv; +struct mwl8k_vif *mv_vif =MWL8K_VIF (vif);int rc; +if (changed &BSS_CHANGED_BSSID ) +memcpy (mv_vif->bssid, info->bssid,IEEE80211_ADDR_LEN ); +if ((changed &BSS_CHANGED_ASSOC ) ==0 )return ;
@@ -3442,7 +3433,6 @@ static const struct ieee80211_ops mwl8k_ .add_interface = mwl8k_add_interface, .remove_interface = mwl8k_remove_interface, .config = mwl8k_config, - .config_interface = mwl8k_config_interface, .bss_info_changed = mwl8k_bss_info_changed, .configure_filter = mwl8k_configure_filter, .set_rts_threshold = mwl8k_set_rts_threshold,
drivers/net/wireless/ath/ar9170/main.c +11 -28
@@ -1360,33 +1360,6 @@ out:return err; } -static int ar9170_op_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct ar9170 *ar = hw->priv; -int err =0 ; - -mutex_lock (&ar->mutex); - -if (conf->changed &IEEE80211_IFCC_BSSID ) { -memcpy (ar->bssid, conf->bssid,ETH_ALEN ); - err =ar9170_set_operating_mode (ar); - } - -if (conf->changed &IEEE80211_IFCC_BEACON ) { - err =ar9170_update_beacon (ar); - -if (err) - goto out; - err =ar9170_set_beacon_timers (ar); - } - -out: -mutex_unlock (&ar->mutex); -return err; -} -static void ar9170_set_filters (struct work_struct *work) { struct ar9170 *ar = container_of(work, struct ar9170,
@@ -1488,6 +1461,17 @@ static void ar9170_op_bss_info_changed(smutex_lock (&ar->mutex); +if (changed &BSS_CHANGED_BSSID ) { +memcpy (ar->bssid, bss_conf->bssid,ETH_ALEN ); + err =ar9170_set_operating_mode (ar); + } + +if (changed & (BSS_CHANGED_BEACON |BSS_CHANGED_BEACON_ENABLED )) { + err =ar9170_update_beacon (ar); +if (!err) +ar9170_set_beacon_timers (ar); + } +ar9170_regwrite_begin (ar);if (changed &BSS_CHANGED_ASSOC ) {
@@ -1796,7 +1780,6 @@ static const struct ieee80211_ops ar9170 .add_interface = ar9170_op_add_interface, .remove_interface = ar9170_op_remove_interface, .config = ar9170_op_config, - .config_interface = ar9170_op_config_interface, .configure_filter = ar9170_op_configure_filter, .conf_tx = ar9170_conf_tx, .bss_info_changed = ar9170_op_bss_info_changed,
drivers/net/wireless/ath/ath5k/base.c +27 -44
102 lines not on this page · raw message
drivers/net/wireless/ath/ath9k/main.c +83 -99
203 lines not on this page · raw message
drivers/net/wireless/b43/main.c +26 -38
94 lines not on this page · raw message
drivers/net/wireless/b43legacy/main.c +24 -39
93 lines not on this page · raw message
drivers/net/wireless/libertas_tf/main.c +23 -33
80 lines not on this page · raw message
drivers/net/wireless/p54/p54common.c +25 -38
88 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2x00.h +0 -3
@@ -943,9 +943,6 @@ int rt2x00mac_add_interface(struct ieee8void rt2x00mac_remove_interface (struct ieee80211_hw *hw,struct ieee80211_if_init_conf *conf);int rt2x00mac_config (struct ieee80211_hw *hw,u32 changed); -int rt2x00mac_config_interface (struct ieee80211_hw *hw, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf); void rt2x00mac_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, unsigned int *total_flags,
drivers/net/wireless/rt2x00/rt2x00mac.c +38 -50
100 lines not on this page · raw message
drivers/net/wireless/rt2x00/rt2400pci.c +0 -1
@@ -1580,7 +1580,6 @@ static const struct ieee80211_ops rt2400 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .get_stats = rt2x00mac_get_stats, .bss_info_changed = rt2x00mac_bss_info_changed,
drivers/net/wireless/rt2x00/rt2500pci.c +0 -1
@@ -1879,7 +1879,6 @@ static const struct ieee80211_ops rt2500 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .get_stats = rt2x00mac_get_stats, .bss_info_changed = rt2x00mac_bss_info_changed,
drivers/net/wireless/rt2x00/rt2500usb.c +0 -1
@@ -1908,7 +1908,6 @@ static const struct ieee80211_ops rt2500 .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rt2x00/rt61pci.c +0 -1
@@ -2735,7 +2735,6 @@ static const struct ieee80211_ops rt61pc .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rt2x00/rt73usb.c +0 -1
@@ -2259,7 +2259,6 @@ static const struct ieee80211_ops rt73us .add_interface = rt2x00mac_add_interface, .remove_interface = rt2x00mac_remove_interface, .config = rt2x00mac_config, - .config_interface = rt2x00mac_config_interface, .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats,
drivers/net/wireless/rtl818x/rtl8180_dev.c +14 -19
@@ -702,30 +702,26 @@ static int rtl8180_config(struct ieee802return 0 ; } -static int rtl8180_config_interface (struct ieee80211_hw *dev, -struct ieee80211_vif *vif, -struct ieee80211_if_conf *conf) -{ -struct rtl8180_priv *priv = dev->priv; -int i; - -for (i =0 ; i <ETH_ALEN ; i++) -rtl818x_iowrite8 (priv, &priv->map->BSSID[i], conf->bssid[i]); - -if (is_valid_ether_addr (conf->bssid)) -rtl818x_iowrite8 (priv, &priv->map->MSR,RTL818X_MSR_INFRA ); -else -rtl818x_iowrite8 (priv, &priv->map->MSR,RTL818X_MSR_NO_LINK ); - -return 0 ; -} -static void rtl8180_bss_info_changed (struct ieee80211_hw *dev,struct ieee80211_vif *vif,struct ieee80211_bss_conf *info,u32 changed) {struct rtl8180_priv *priv = dev->priv; +int i; + +if (changed &BSS_CHANGED_BSSID ) { +for (i =0 ; i <ETH_ALEN ; i++) +rtl818x_iowrite8 (priv, &priv->map->BSSID[i], + info->bssid[i]); + +if (is_valid_ether_addr (info->bssid)) +rtl818x_iowrite8 (priv, &priv->map->MSR, +RTL818X_MSR_INFRA ); +else +rtl818x_iowrite8 (priv, &priv->map->MSR, +RTL818X_MSR_NO_LINK ); + }if (changed &BSS_CHANGED_ERP_SLOT && priv->rf->conf_erp) priv->rf->conf_erp (dev, info);
@@ -770,7 +766,6 @@ static const struct ieee80211_ops rtl818 .add_interface = rtl8180_add_interface, .remove_interface = rtl8180_remove_interface, .config = rtl8180_config, - .config_interface = rtl8180_config_interface, .bss_info_changed = rtl8180_bss_info_changed, .configure_filter = rtl8180_configure_filter, };
drivers/net/wireless/rtl818x/rtl8187_dev.c +21 -27
66 lines not on this page · raw message
drivers/net/wireless/zd1211rw/zd_mac.c +33 -47
101 lines not on this page · raw message