cfg80211/nl80211: scanning (and mac80211 update to use it)
Johannes Berg
maintainerPATCH 1/1 cfg80211/nl80211: scanning (and mac80211 update to use it)
This patch adds basic scan capability to cfg80211/nl80211 and changes mac80211 to use it. The BSS list that cfg80211 maintains is made driver-accessible with a private area in each BSS struct, but mac80211 doesn't yet use it. That's another large project.
Signed-off-by Johannes Berg <[email protected]>
---
TODO (later):
* use BSS stuff from cfg80211 in mac80211 (this is fairly involved)
* port a fullmac driver and complete the API
drivers/net/wireless/iwlwifi/iwl-agn.c | 12 drivers/net/wireless/iwlwifi/iwl-scan.c | 2 drivers/net/wireless/iwlwifi/iwl3945-base.c | 17 include/linux/nl80211.h | 65 ++ include/net/cfg80211.h | 131 ++++ include/net/mac80211.h | 6 include/net/wireless.h | 3 net/mac80211/cfg.c | 23 net/mac80211/ieee80211_i.h | 18 net/mac80211/iface.c | 2 net/mac80211/main.c | 32 + net/mac80211/mlme.c | 37 - net/mac80211/scan.c | 356 ++---------- net/mac80211/wext.c | 59 -- net/wireless/Makefile | 2 net/wireless/core.c | 8 net/wireless/core.h | 20 net/wireless/nl80211.c | 323 +++++++++++ net/wireless/nl80211.h | 8 net/wireless/scan.c | 807 ++++++++++++++++++++++++++++ 20 files changed, 1548 insertions(+), 383 deletions(-)
include/linux/nl80211.h +65 -0
@@ -143,6 +143,13 @@* added to all specified management frames generated by * kernel/firmware/driver. * +* @NL80211_CMD_GET_SCAN: get scan results +* @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters +* @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to +* NL80211_CMD_GET_SCAN and on the "scan" multicast group) +* @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons, +* partial scan results may be available +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -192,6 +199,11 @@ enum nl80211_commands {NL80211_CMD_GET_REG , +NL80211_CMD_GET_SCAN , +NL80211_CMD_TRIGGER_SCAN , +NL80211_CMD_NEW_SCAN_RESULTS , +NL80211_CMD_SCAN_ABORTED , +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -305,6 +317,18 @@ enum nl80211_commands {* @NL80211_ATTR_IE: Information element(s) data (used, e.g., with * %NL80211_CMD_SET_MGMT_EXTRA_IE). * +* @NL80211_ATTR_MAX_NUM_SCAN_SSIDS: number of SSIDs you can scan with +* a single scan request, a wiphy attribute. +* +* @NL80211_ATTR_SCAN_FREQUENCIES: nested attribute with frequencies (in MHz) +* @NL80211_ATTR_SCAN_SSIDS: nested attribute with SSIDs, leave out for passive +* scanning and include a zero-length SSID (wildcard) for wildcard scan +* @NL80211_ATTR_SCAN_GENERATION: the scan generation increases whenever the +* scan result list changes (BSS expired or added) so that applications +* can verify that they got a single, consistent snapshot (when all dump +* messages carried the same generation number) +* @NL80211_ATTR_BSS: scan result BSS +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -372,6 +396,13 @@ enum nl80211_attrs {NL80211_ATTR_MGMT_SUBTYPE ,NL80211_ATTR_IE , +NL80211_ATTR_MAX_NUM_SCAN_SSIDS , + +NL80211_ATTR_SCAN_FREQUENCIES , +NL80211_ATTR_SCAN_SSIDS , +NL80211_ATTR_SCAN_GENERATION , +NL80211_ATTR_BSS , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -841,4 +872,38 @@ enum nl80211_channel_type {NL80211_CHAN_HT40MINUS ,NL80211_CHAN_HT40PLUS }; + +/** +* enum nl80211_bss - netlink attributes for a BSS +* +* @__NL80211_BSS_INVALID: invalid +* @NL80211_BSS_FREQUENCY: frequency in MHz (u32) +* @NL80211_BSS_TSF: TSF of the received probe response/beacon (u64) +* @NL80211_BSS_BEACON_INTERVAL: beacon interval of the (I)BSS (u16) +* @NL80211_BSS_CAPABILITY: capability field (CPU order, u16) +* @NL80211_BSS_INFORMATION_ELEMENTS: binary attribute containing the +* raw information elements from the probe response/beacon (bin) +* @NL80211_BSS_SIGNAL_MBM: signal strength of probe response/beacon +* in mBm (100 * dBm) (s32) +* @NL80211_BSS_SIGNAL_UNSPEC: signal strength of the probe response/beacon +* in unspecified units, scaled to 0..100 (u8) +* @__NL80211_BSS_AFTER_LAST: internal +* @NL80211_BSS_MAX: highest BSS attribute +*/ +enum nl80211_bss { + __NL80211_BSS_INVALID, +NL80211_BSS_BSSID , +NL80211_BSS_FREQUENCY , +NL80211_BSS_TSF , +NL80211_BSS_BEACON_INTERVAL , +NL80211_BSS_CAPABILITY , +NL80211_BSS_INFORMATION_ELEMENTS , +NL80211_BSS_SIGNAL_MBM , +NL80211_BSS_SIGNAL_UNSPEC , + +/* keep last */ + __NL80211_BSS_AFTER_LAST, +NL80211_BSS_MAX = __NL80211_BSS_AFTER_LAST -1 +}; +#endif /* __LINUX_NL80211_H */
include/net/cfg80211.h +131 -0
160 lines not on this page · raw message
net/wireless/nl80211.c +323 -0
371 lines not on this page · raw message
net/wireless/scan.c new file +807 -0
807 lines not on this page · raw message
net/mac80211/ieee80211_i.h +9 -9
@@ -294,8 +294,6 @@ struct ieee80211_if_sta {u8 ssid[IEEE80211_MAX_SSID_LEN ];enum ieee80211_sta_mlme_state state;size_t ssid_len; -u8 scan_ssid[IEEE80211_MAX_SSID_LEN ]; -size_t scan_ssid_len;u16 aid;u16 ap_capab, capab;u8 *extra_ie;/* to be added to the end of AssocReq */
@@ -662,17 +660,18 @@ struct ieee80211_local {/* Scanning and BSS list */ bool sw_scanning, hw_scanning; +struct cfg80211_ssid scan_ssid; +struct cfg80211_scan_request int_scan_req; +struct cfg80211_scan_request *scan_req; +struct ieee80211_channel *scan_channel;int scan_channel_idx; -enum ieee80211_band scan_band;enum {SCAN_SET_CHANNEL ,SCAN_SEND_PROBE } scan_state;unsigned long last_scan_completed;struct delayed_work scan_work;struct ieee80211_sub_if_data *scan_sdata; -struct ieee80211_channel *oper_channel, *scan_channel, *csa_channel;enum nl80211_channel_type oper_channel_type; -u8 scan_ssid[IEEE80211_MAX_SSID_LEN ]; -size_t scan_ssid_len; +struct ieee80211_channel *oper_channel, *csa_channel;struct list_head bss_list;struct ieee80211_bss *bss_hash[STA_HASH_SIZE ];spinlock_t bss_lock;
@@ -930,7 +929,7 @@ void ieee80211_send_probe_req(struct iee/* scan/BSS handling */ int ieee80211_request_scan (struct ieee80211_sub_if_data *sdata, -u8 *ssid,size_t ssid_len); +struct cfg80211_scan_request *req);int ieee80211_scan_results (struct ieee80211_local *local,struct iw_request_info *info,char *buf,size_t len);
@@ -945,14 +944,15 @@ int ieee80211_sta_set_extra_ie(struct ievoid ieee80211_mlme_notify_scan_completed (struct ieee80211_local *local);int ieee80211_start_scan (struct ieee80211_sub_if_data *scan_sdata, -u8 *ssid,size_t ssid_len); +struct cfg80211_scan_request *req);struct ieee80211_bss *ieee80211_bss_info_update (struct ieee80211_local *local,struct ieee80211_rx_status *rx_status,struct ieee80211_mgmt *mgmt,size_t len,struct ieee802_11_elems *elems, -int freq,bool beacon); +struct ieee80211_channel *channel, +bool beacon);struct ieee80211_bss *ieee80211_rx_bss_add (struct ieee80211_local *local,u8 *bssid,int freq,u8 *ssid,u8 ssid_len);
net/mac80211/scan.c +60 -296
466 lines not on this page · raw message
net/mac80211/wext.c +4 -55
78 lines not on this page · raw message
net/mac80211/mlme.c +28 -9
@@ -1713,7 +1713,7 @@ static void ieee80211_rx_bss_info(struct } bss =ieee80211_bss_info_update (local, rx_status, mgmt, len, elems, - freq, beacon); + channel, beacon);if (!bss)return ;
@@ -2117,7 +2117,15 @@ static void ieee80211_sta_merge_ibss(strprintk (KERN_DEBUG "%s: No active IBSS STAs - trying to scan for other " "IBSS networks with same SSID (merge)\n" , sdata->dev->name); -ieee80211_request_scan (sdata, ifsta->ssid, ifsta->ssid_len); + +/* XXX maybe racy? */ +if (sdata->local->scan_req) +return ; + +memcpy (sdata->local->int_scan_req.ssids[0 ].ssid, + ifsta->ssid,IEEE80211_MAX_SSID_LEN ); + sdata->local->int_scan_req.ssids[0 ].ssid_len = ifsta->ssid_len; +ieee80211_request_scan (sdata, &sdata->local->int_scan_req); }
@@ -2333,8 +2341,15 @@ dont_join: IEEE80211_SCAN_INTERVAL)) {printk (KERN_DEBUG "%s: Trigger new scan to find an IBSS to " "join\n" , sdata->dev->name); -return ieee80211_request_scan (sdata, ifsta->ssid, - ifsta->ssid_len); + +/* XXX maybe racy? */ +if (local->scan_req) +return -EBUSY ; + +memcpy (local->int_scan_req.ssids[0 ].ssid, + ifsta->ssid,IEEE80211_MAX_SSID_LEN ); + local->int_scan_req.ssids[0 ].ssid_len = ifsta->ssid_len; +return ieee80211_request_scan (sdata, &local->int_scan_req); } else if (ifsta->state != IEEE80211_STA_MLME_IBSS_JOINED) {int interval =IEEE80211_SCAN_INTERVAL ;
@@ -2433,11 +2448,16 @@ static int ieee80211_sta_config_auth(str }else {if (ifsta->assoc_scan_tries <IEEE80211_ASSOC_SCANS_MAX_TRIES ) { ifsta->assoc_scan_tries++; +/* XXX maybe racy? */ +if (local->scan_req) +return -1 ; +memcpy (local->int_scan_req.ssids[0 ].ssid, + ifsta->ssid,IEEE80211_MAX_SSID_LEN );if (ifsta->flags &IEEE80211_STA_AUTO_SSID_SEL ) -ieee80211_start_scan (sdata,NULL ,0 ); + local->int_scan_req.ssids[0 ].ssid_len =0 ;else -ieee80211_start_scan (sdata, ifsta->ssid, - ifsta->ssid_len); + local->int_scan_req.ssids[0 ].ssid_len = ifsta->ssid_len; +ieee80211_start_scan (sdata, &local->int_scan_req); ifsta->state =IEEE80211_STA_MLME_AUTHENTICATE ;set_bit (IEEE80211_STA_REQ_AUTH , &ifsta->request); }else {
@@ -2475,8 +2495,7 @@ static void ieee80211_sta_work(struct wo ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE && ifsta->state != IEEE80211_STA_MLME_ASSOCIATE && test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) { -ieee80211_start_scan (sdata, ifsta->scan_ssid, - ifsta->scan_ssid_len); +ieee80211_start_scan (sdata, local->scan_req);return ; }
net/mac80211/cfg.c +23 -0
@@ -1272,6 +1272,28 @@ static int ieee80211_resume(struct wiphy#define ieee80211_resume NULL#endif +static int ieee80211_scan (struct wiphy *wiphy, +struct net_device *dev, +struct cfg80211_scan_request *req) +{ +struct ieee80211_sub_if_data *sdata; + +if (!netif_running (dev)) +return -ENETDOWN ; + + sdata =IEEE80211_DEV_TO_SUB_IF (dev); + +if (sdata->vif.type !=NL80211_IFTYPE_STATION && + sdata->vif.type !=NL80211_IFTYPE_ADHOC && + sdata->vif.type !=NL80211_IFTYPE_MESH_POINT ) +return -EOPNOTSUPP ; + +if (req->n_ssids !=1 ) +return -EINVAL ; + +return ieee80211_request_scan (sdata, req); +} +struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -1304,4 +1326,5 @@ struct cfg80211_ops mac80211_config_ops .set_mgmt_extra_ie = ieee80211_set_mgmt_extra_ie, .suspend = ieee80211_suspend, .resume = ieee80211_resume, + .scan = ieee80211_scan, };
net/wireless/Makefile +1 -1
@@ -5,7 +5,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib8 obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o cfg80211-$(CONFIG_NL80211) += nl80211.o
net/mac80211/main.c +29 -3
@@ -731,6 +731,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(return NULL ; wiphy->privid = mac80211_wiphy_privid; + wiphy->max_scan_ssids =4 ; local =wiphy_priv (wiphy); local->hw.wiphy = wiphy;
@@ -820,25 +821,33 @@ int ieee80211_register_hw(struct ieee802enum ieee80211_band band;struct net_device *mdev;struct ieee80211_master_priv *mpriv; +int channels, i, j;/* * generic code guarantees at least one band, * set this very early because much code assumes * that hw.conf.channel is assigned */ + channels =0 ;for (band =0 ; band <IEEE80211_NUM_BANDS ; band++) {struct ieee80211_supported_band *sband; sband = local->hw.wiphy->bands[band]; -if (sband) { +if (sband && !local->oper_channel) {/* init channel we're on */ local->hw.conf.channel = local->oper_channel = local->scan_channel = &sband->channels[0 ]; -break ; } +if (sband) + channels += sband->n_channels; } + local->int_scan_req.n_channels = channels; + local->int_scan_req.channels =kzalloc (sizeof (void *) * channels,GFP_KERNEL ); +if (!local->int_scan_req.channels) +return -ENOMEM ; +/* if low-level driver supports AP, we also support VLAN */ if (local->hw.wiphy->interface_modes &BIT (NL80211_IFTYPE_AP )) local->hw.wiphy->interface_modes |=BIT (NL80211_IFTYPE_AP_VLAN );
@@ -848,7 +857,7 @@ int ieee80211_register_hw(struct ieee802 result =wiphy_register (local->hw.wiphy);if (result <0 ) -return result; + goto fail_wiphy_register;/* * We use the number of queues for feature tests (QoS, HT) internally
@@ -951,6 +960,20 @@ int ieee80211_register_hw(struct ieee802ieee80211_led_init (local); +/* alloc internal scan request */ + i =0 ; + local->int_scan_req.ssids = &local->scan_ssid; + local->int_scan_req.n_ssids =1 ; +for (band =0 ; band <IEEE80211_NUM_BANDS ; band++) { +if (!hw->wiphy->bands[band]) +continue ; +for (j =0 ; j < hw->wiphy->bands[band]->n_channels; j++) { + local->int_scan_req.channels[i] = + &hw->wiphy->bands[band]->channels[j]; + i++; + } + } +return 0 ; fail_wep:
@@ -969,6 +992,8 @@ fail_workqueue:free_netdev (local->mdev); fail_mdev_alloc:wiphy_unregister (local->hw.wiphy); +fail_wiphy_register: +kfree (local->int_scan_req.channels);return result; }EXPORT_SYMBOL (ieee80211_register_hw);
@@ -1014,6 +1039,7 @@ void ieee80211_unregister_hw(struct ieeeieee80211_wep_free (local);ieee80211_led_exit (local);free_netdev (local->mdev); +kfree (local->int_scan_req.channels); }EXPORT_SYMBOL (ieee80211_unregister_hw);
net/wireless/nl80211.h +8 -0
@@ -7,6 +7,10 @@extern int nl80211_init (void );extern void nl80211_exit (void );extern void nl80211_notify_dev_rename (struct cfg80211_registered_device *rdev); +extern void nl80211_send_scan_done (struct cfg80211_registered_device *rdev, +struct net_device *netdev); +extern void nl80211_send_scan_aborted (struct cfg80211_registered_device *rdev, +struct net_device *netdev);#else static inline int nl80211_init (void ) {
@@ -19,6 +23,10 @@ static inline void nl80211_notify_dev_re struct cfg80211_registered_device *rdev) { } +static inline void +nl80211_send_scan_done (struct cfg80211_registered_device *rdev, +struct net_device *netdev) +{}#endif /* CONFIG_NL80211 */ #endif /* __NET_WIRELESS_NL80211_H */
net/wireless/core.c +8 -0
@@ -240,6 +240,8 @@ struct wiphy *wiphy_new(struct cfg80211_mutex_init (&drv->mtx);mutex_init (&drv->devlist_mtx);INIT_LIST_HEAD (&drv->netdev_list); +spin_lock_init (&drv->bss_lock); +INIT_LIST_HEAD (&drv->bss_list);device_initialize (&drv->wiphy.dev); drv->wiphy.dev.class = &ieee80211_class;
@@ -259,6 +261,9 @@ int wiphy_register(struct wiphy *wiphy)int i;u16 ifmodes = wiphy->interface_modes; +if (WARN_ON (wiphy->max_scan_ssids <1 )) +return -EINVAL ; +/* sanity check ifmodes */ WARN_ON (!ifmodes); ifmodes &= ((1 << __NL80211_IFTYPE_AFTER_LAST) -1 ) & ~1 ;
@@ -367,8 +372,11 @@ EXPORT_SYMBOL(wiphy_unregister);void cfg80211_dev_free (struct cfg80211_registered_device *drv) { +struct cfg80211_internal_bss *scan, *tmp;mutex_destroy (&drv->mtx);mutex_destroy (&drv->devlist_mtx); +list_for_each_entry_safe (scan, tmp, &drv->bss_list, list) +kfree (scan);kfree (drv); }
net/wireless/core.h +20 -0
@@ -8,6 +8,8 @@#include <linux/mutex.h> #include <linux/list.h> #include <linux/netdevice.h> +#include <linux/kref.h> +#include <linux/rbtree.h> #include <net/genetlink.h> #include <net/wireless.h> #include <net/cfg80211.h>
@@ -41,6 +43,13 @@ struct cfg80211_registered_device {struct mutex devlist_mtx;struct list_head netdev_list; +/* BSSes/scanning */ +spinlock_t bss_lock; +struct list_head bss_list; +struct rb_root bss_tree; +u32 bss_generation; +struct cfg80211_scan_request *scan_req;/* protected by RTNL */ +/* must be last because of the way we do wiphy_priv(), * and it should at least be aligned to NETDEV_ALIGN */ struct wiphy wiphy __attribute__((__aligned__(NETDEV_ALIGN)));
@@ -56,6 +65,15 @@ struct cfg80211_registered_device *wiphyextern struct mutex cfg80211_drv_mutex;extern struct list_head cfg80211_drv_list; +struct cfg80211_internal_bss { +struct list_head list; +struct rb_node rbn; +unsigned long ts; +struct kref ref; +/* must be last because of priv member */ +struct cfg80211_bss pub; +}; +/* * This function returns a pointer to the driver * that the genl_info item that is passed refers to.
@@ -94,4 +112,6 @@ extern int cfg80211_dev_rename(struct cfvoid ieee80211_set_bitrate_flags (struct wiphy *wiphy);void wiphy_update_regulatory (struct wiphy *wiphy,enum reg_set_by setby); +void cfg80211_bss_expire (struct cfg80211_registered_device *dev); +#endif /* __NET_WIRELESS_CORE_H */
include/net/wireless.h +3 -0
@@ -213,6 +213,9 @@ struct wiphy {bool custom_regulatory;bool strict_regulatory; +int bss_priv_size; +u8 max_scan_ssids; +/* If multiple wiphys are registered and you're handed e.g. * a regular netdev with assigned ieee80211_ptr, you won't * know whether it points to a wiphy your driver has registered
include/net/mac80211.h +4 -2
@@ -1401,7 +1401,8 @@ struct ieee80211_ops {void (*update_tkip_key)(struct ieee80211_hw *hw,struct ieee80211_key_conf *conf,const u8 *address,u32 iv32,u16 *phase1key); -int (*hw_scan)(struct ieee80211_hw *hw,u8 *ssid,size_t len); +int (*hw_scan)(struct ieee80211_hw *hw, +struct cfg80211_scan_request *req);int (*get_stats)(struct ieee80211_hw *hw,struct ieee80211_low_level_stats *stats); void (*get_tkip_seq)(struct ieee80211_hw *hw, u8 hw_key_idx,
@@ -1839,8 +1840,9 @@ void ieee80211_wake_queues(struct ieee80* mac80211 that the scan finished. * * @hw: the hardware that finished the scan +* @aborted: set to true if scan was aborted */ -void ieee80211_scan_completed (struct ieee80211_hw *hw); +void ieee80211_scan_completed (struct ieee80211_hw *hw,bool aborted);/** * ieee80211_iterate_active_interfaces - iterate active interfaces
drivers/net/wireless/iwlwifi/iwl-agn.c +10 -2
@@ -2678,11 +2678,19 @@ static void iwl_bss_info_changed(struct } -static int iwl_mac_hw_scan (struct ieee80211_hw *hw,u8 *ssid,size_t ssid_len) +static int iwl_mac_hw_scan (struct ieee80211_hw *hw, +struct cfg80211_scan_request *req) {unsigned long flags;struct iwl_priv *priv = hw->priv;int ret; +u8 *ssid =NULL ; +size_t ssid_len =0 ; + +if (req->n_ssids) { + ssid = req->ssids[0 ].ssid; + ssid_len = req->ssids[0 ].ssid_len; + }IWL_DEBUG_MAC80211 (priv,"enter\n" );
@@ -2718,7 +2726,7 @@ static int iwl_mac_hw_scan(struct ieee80if (ssid_len) { priv->one_direct_scan =1 ; - priv->direct_ssid_len =min_t (u8, ssid_len,IW_ESSID_MAX_SIZE ); + priv->direct_ssid_len = ssid_len;memcpy (priv->direct_ssid, ssid, priv->direct_ssid_len); }else { priv->one_direct_scan =0 ;
drivers/net/wireless/iwlwifi/iwl3945-base.c +13 -4
@@ -4442,15 +4442,23 @@ static void iwl3945_bss_info_changed(str } -static int iwl3945_mac_hw_scan (struct ieee80211_hw *hw,u8 *ssid,size_t len) +static int iwl3945_mac_hw_scan (struct ieee80211_hw *hw, +struct cfg80211_scan_request *req) {int rc =0 ;unsigned long flags;struct iwl_priv *priv = hw->priv; +size_t len =0 ; +u8 *ssid =NULL ;DECLARE_SSID_BUF (ssid_buf);IWL_DEBUG_MAC80211 (priv,"enter\n" ); +if (req->n_ssids) { + ssid = req->ssids[0 ].ssid; + len = req->ssids[0 ].ssid_len; + } +mutex_lock (&priv->mutex);spin_lock_irqsave (&priv->lock, flags);
@@ -4478,9 +4486,8 @@ static int iwl3945_mac_hw_scan(struct ie print_ssid(ssid_buf, ssid, len), len); priv->one_direct_scan =1 ; - priv->direct_ssid_len = (u8 ) -min ((u8 ) len, (u8 )IW_ESSID_MAX_SIZE ); -memcpy (priv->direct_ssid, ssid, priv->direct_ssid_len); + priv->direct_ssid_len = len; +memcpy (priv->direct_ssid, ssid, len); }else priv->one_direct_scan =0 ;
@@ -5412,6 +5419,8 @@ static int iwl3945_pci_probe(struct pci_ hw->wiphy->custom_regulatory = true; + hw->wiphy->max_scan_ssids =1 ; +/* 4 EDCA QOS priorities */ hw->queues =4 ;
net/mac80211/iface.c +1 -1
@@ -522,7 +522,7 @@ static int ieee80211_stop(struct net_dev* scan event to userspace -- the scan is incomplete. */ if (local->sw_scanning) -ieee80211_scan_completed (&local->hw); +ieee80211_scan_completed (&local->hw, true); } conf.vif = &sdata->vif;
drivers/net/wireless/iwlwifi/iwl-scan.c +1 -1
@@ -860,7 +860,7 @@ void iwl_bg_scan_completed(struct work_sif (test_bit (STATUS_EXIT_PENDING , &priv->status))return ; -ieee80211_scan_completed (priv->hw); +ieee80211_scan_completed (priv->hw, false);/* Since setting the TXPOWER may have been deferred while * performing the scan, fire one off */
Johannes Berg
maintainerTested, FYI:
# iw dev wlan2 scan dump|grep SSID|wc -l 1063
johannes