wireless patch dump
Johannes Berg
maintainerv4 cover wireless patch dump
Since not all of my patches as previously sent out still applied due to net-2.6 merge via 2.6.31-rc1, here's a dump of all my patches.
It includes the connect() API, lots of wext removal from mac80211, and does not break orinoco, iwm or rndis. :)
johannes
Johannes Berg
maintainerPATCH v4 1/20 wext: allow returning NULL stats
Currently, wext drivers cannot return NULL for stats even though that would make the ioctl return -EOPNOTSUPP because that would mean they are no longer listed in /proc/net/wireless. This patch changes the wext core's behaviour to list them if they have any wireless_handlers, but only show their stats when available, so that drivers can start returning NULL if stats are currently not available, reducing confusion for e.g. IBSS.
--- net/wireless/wext.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/wireless/wext.c +8 -1
@@ -610,6 +610,11 @@ static void wireless_seq_printf_stats(st {/* Get stats from the driver */ struct iw_statistics *stats =get_wireless_stats (dev); +static struct iw_statistics nullstats = {}; + +/* show device if it's wireless regardless of current stats */ +if (!stats && dev->wireless_handlers) + stats = &nullstats;if (stats) { seq_printf(seq, "%6s: %04x %3d%c %3d%c %3d%c %6d %6d %6d "
@@ -628,7 +633,9 @@ static void wireless_seq_printf_stats(st stats->discard.nwid, stats->discard.code, stats->discard.fragment, stats->discard.retries, stats->discard.misc, stats->miss.beacon); - stats->qual.updated &= ~IW_QUAL_ALL_UPDATED ; + +if (stats != &nullstats) + stats->qual.updated &= ~IW_QUAL_ALL_UPDATED ; } }
Johannes Berg
maintainerPATCH v4 3/20 wext: default to y
In reply to Johannes BergThe way I initially thought we could do wireless extensions is by making all the compat code in cfg80211 be independent of CONFIG_WIRELESS_EXT, but this is turning out to not be feasible. Therefore, fix the Kconfig help text and make the option default to yes, so people won't get a nasty surprise when mac80211 will get rid of its 'select WIRELESS_EXT' any time now.
--- net/wireless/Kconfig | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
net/wireless/Kconfig +3 -9
@@ -35,19 +35,13 @@ config WIRELESS_OLD_REGULATORY config WIRELESS_EXT bool "Wireless extensions" - default n + default y ---help--- This option enables the legacy wireless extensions (wireless network interface configuration via ioctls.) - Wireless extensions will be replaced by cfg80211 and - will be required only by legacy drivers that implement - wireless extension handlers. This option does not - affect the wireless-extension backward compatibility - code in cfg80211. - - Say N (if you can) unless you know you need wireless - extensions for external modules. + Say Y unless you've upgraded all your userspace to use + nl80211 instead of wireless extensions. config WIRELESS_EXT_SYSFS bool "Wireless extensions sysfs files"
Johannes Berg
maintainerPATCH v4 2/20 mac80211: fix todo lock
In reply to Johannes BergThe key todo lock can be taken from different locks that require it to be _bh to avoid lock inversion due to (soft)irqs.
This should fix the two problems reported by Bob and Gabor:
http://mid.gmane.org/[email protected]
http://mid.gmane.org/[email protected]
--- net/mac80211/key.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-)
net/mac80211/key.c +15 -13
@@ -67,6 +67,8 @@ static DECLARE_WORK(todo_work, key_todo)* * @key: key to add to do item for * @flag: todo flag(s) +* +* Must be called with IRQs or softirqs disabled. */ static void add_todo (struct ieee80211_key *key,u32 flag) {
@@ -140,9 +142,9 @@ static void ieee80211_key_enable_hw_acce ret =drv_set_key (key->local,SET_KEY , &sdata->vif, sta, &key->conf);if (!ret) { -spin_lock (&todo_lock); +spin_lock_bh (&todo_lock); key->flags |=KEY_FLAG_UPLOADED_TO_HARDWARE ; -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock); }if (ret && ret != -ENOSPC && ret != -EOPNOTSUPP )
@@ -164,12 +166,12 @@ static void ieee80211_key_disable_hw_accif (!key || !key->local->ops->set_key)return ; -spin_lock (&todo_lock); +spin_lock_bh (&todo_lock);if (!(key->flags &KEY_FLAG_UPLOADED_TO_HARDWARE )) { -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock);return ; } -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock); sta =get_sta_for_key (key); sdata = key->sdata;
@@ -188,9 +190,9 @@ static void ieee80211_key_disable_hw_accwiphy_name (key->local->hw.wiphy), key->conf.keyidx, sta ? sta->addr : bcast_addr, ret); -spin_lock (&todo_lock); +spin_lock_bh (&todo_lock); key->flags &= ~KEY_FLAG_UPLOADED_TO_HARDWARE ; -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock); } static void __ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata,
@@ -437,14 +439,14 @@ void ieee80211_key_link(struct ieee80211__ieee80211_key_replace (sdata, sta, old_key, key); -spin_unlock_irqrestore (&sdata->local->key_lock, flags); -/* free old key later */ add_todo (old_key,KEY_FLAG_TODO_DELETE );add_todo (key,KEY_FLAG_TODO_ADD_DEBUGFS );if (netif_running (sdata->dev))add_todo (key,KEY_FLAG_TODO_HWACCEL_ADD ); + +spin_unlock_irqrestore (&sdata->local->key_lock, flags); }static void __ieee80211_key_free (struct ieee80211_key *key)
@@ -547,7 +549,7 @@ static void __ieee80211_key_todo(void)*/ synchronize_rcu (); -spin_lock (&todo_lock); +spin_lock_bh (&todo_lock);while (!list_empty (&todo_list)) { key = list_first_entry(&todo_list, struct ieee80211_key, todo);list_del_init (&key->todo);
@@ -558,7 +560,7 @@ static void __ieee80211_key_todo(void)KEY_FLAG_TODO_HWACCEL_REMOVE | KEY_FLAG_TODO_DELETE); key->flags &= ~todoflags; -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock); work_done = false;
@@ -591,9 +593,9 @@ static void __ieee80211_key_todo(void)WARN_ON (!work_done); -spin_lock (&todo_lock); +spin_lock_bh (&todo_lock); } -spin_unlock (&todo_lock); +spin_unlock_bh (&todo_lock); }void ieee80211_key_todo (void )
Johannes Berg
maintainerPATCH v4 4/20 cfg80211: move break statement to correct place
In reply to Johannes BergMove a break statement to the correct place _after_ the #endif, otherwise w/o WIRELESS_EXT things break badly. Also, while touching this code, do a cleanup and assign dev->ieee80211_ptr to a new variable.
--- net/wireless/core.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
net/wireless/core.c +16 -15
@@ -526,52 +526,53 @@ static int cfg80211_netdev_notifier_call void *ndev) {struct net_device *dev = ndev; +struct wireless_dev *wdev = dev->ieee80211_ptr;struct cfg80211_registered_device *rdev; -if (!dev->ieee80211_ptr) +if (!wdev)return NOTIFY_DONE ; - rdev =wiphy_to_dev (dev->ieee80211_ptr->wiphy); + rdev =wiphy_to_dev (wdev->wiphy); -WARN_ON (dev->ieee80211_ptr->iftype ==NL80211_IFTYPE_UNSPECIFIED ); +WARN_ON (wdev->iftype ==NL80211_IFTYPE_UNSPECIFIED );switch (state) {case NETDEV_REGISTER :mutex_lock (&rdev->devlist_mtx); -list_add (&dev->ieee80211_ptr->list, &rdev->netdev_list); +list_add (&wdev->list, &rdev->netdev_list);if (sysfs_create_link (&dev->dev.kobj, &rdev->wiphy.dev.kobj,"phy80211" )) {printk (KERN_ERR "wireless: failed to add phy80211 " "symlink to netdev!\n" ); } - dev->ieee80211_ptr->netdev = dev; + wdev->netdev = dev;#ifdef CONFIG_WIRELESS_EXT - dev->ieee80211_ptr->wext.default_key =-1 ; - dev->ieee80211_ptr->wext.default_mgmt_key =-1 ; + wdev->wext.default_key =-1 ; + wdev->wext.default_mgmt_key =-1 ;#endif mutex_unlock (&rdev->devlist_mtx);break ;case NETDEV_GOING_DOWN : -if (dev->ieee80211_ptr->iftype !=NL80211_IFTYPE_ADHOC ) +if (wdev->iftype !=NL80211_IFTYPE_ADHOC )break ; -if (!dev->ieee80211_ptr->ssid_len) +if (!wdev->ssid_len)break ;cfg80211_leave_ibss (rdev, dev, true);break ;case NETDEV_UP :#ifdef CONFIG_WIRELESS_EXT -if (dev->ieee80211_ptr->iftype !=NL80211_IFTYPE_ADHOC ) +if (wdev->iftype !=NL80211_IFTYPE_ADHOC )break ; -if (!dev->ieee80211_ptr->wext.ibss.ssid_len) +if (!wdev->wext.ibss.ssid_len)break ; -cfg80211_join_ibss (rdev, dev, &dev->ieee80211_ptr->wext.ibss); -break ; +cfg80211_join_ibss (rdev, dev, &wdev->wext.ibss);#endif +break ;case NETDEV_UNREGISTER :mutex_lock (&rdev->devlist_mtx); -if (!list_empty (&dev->ieee80211_ptr->list)) { +if (!list_empty (&wdev->list)) {sysfs_remove_link (&dev->dev.kobj,"phy80211" ); -list_del_init (&dev->ieee80211_ptr->list); +list_del_init (&wdev->list); }mutex_unlock (&rdev->devlist_mtx);break ;
Johannes Berg
maintainerPATCH v4 5/20 nl80211: clean up function definitions
In reply to Johannes BergI don't like the 'extern' keyword much when it's not necessary, it makes lines rather long.
--- net/wireless/nl80211.h | 58 ++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 29 deletions(-)
net/wireless/nl80211.h +29 -29
@@ -3,41 +3,41 @@#include "core.h" -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_start (struct cfg80211_registered_device *rdev, -struct net_device *netdev); -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); -extern void nl80211_send_reg_change_event (struct regulatory_request *request); -extern void nl80211_send_rx_auth (struct cfg80211_registered_device *rdev, -struct net_device *netdev, -const u8 *buf,size_t len); -extern void nl80211_send_rx_assoc (struct cfg80211_registered_device *rdev, -struct net_device *netdev, -const u8 *buf,size_t len); -extern void nl80211_send_deauth (struct cfg80211_registered_device *rdev, +int nl80211_init (void ); +void nl80211_exit (void ); +void nl80211_notify_dev_rename (struct cfg80211_registered_device *rdev); +void nl80211_send_scan_start (struct cfg80211_registered_device *rdev, +struct net_device *netdev); +void nl80211_send_scan_done (struct cfg80211_registered_device *rdev, +struct net_device *netdev); +void nl80211_send_scan_aborted (struct cfg80211_registered_device *rdev, +struct net_device *netdev); +void nl80211_send_reg_change_event (struct regulatory_request *request); +void nl80211_send_rx_auth (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +const u8 *buf,size_t len); +void nl80211_send_rx_assoc (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +const u8 *buf,size_t len); +void nl80211_send_deauth (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +const u8 *buf,size_t len); +void nl80211_send_disassoc (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +const u8 *buf,size_t len); +void nl80211_send_auth_timeout (struct cfg80211_registered_device *rdev, +struct net_device *netdev, +const u8 *addr); +void nl80211_send_assoc_timeout (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *buf,size_t len); -extern void nl80211_send_disassoc (struct cfg80211_registered_device *rdev, -struct net_device *netdev, -const u8 *buf,size_t len); -extern void nl80211_send_auth_timeout (struct cfg80211_registered_device *rdev, -struct net_device *netdev, -const u8 *addr); -extern void nl80211_send_assoc_timeout (struct cfg80211_registered_device *rdev, -struct net_device *netdev, -const u8 *addr); -extern void +const u8 *addr); +void nl80211_michael_mic_failure (struct cfg80211_registered_device *rdev,struct net_device *netdev,const u8 *addr,enum nl80211_key_type key_type,int key_id,const u8 *tsc); -extern void +void nl80211_send_beacon_hint_event (struct wiphy *wiphy,struct ieee80211_channel *channel_before,struct ieee80211_channel *channel_after);
Johannes Berg
maintainerPATCH v4 6/20 cfg80211: use proper allocation flags
In reply to Johannes BergInstead of hardcoding GFP_ATOMIC everywhere, add a new function parameter that gets the flags from the caller. Obviously then I need to update all callers (all of them in mac80211), and it turns out that now it's ok to use GFP_KERNEL in almost all places.
--- include/net/cfg80211.h | 21 +++++++++++++------ net/mac80211/event.c | 5 ++-- net/mac80211/ieee80211_i.h | 3 +- net/mac80211/mlme.c | 30 +++++++++++++++++----------- net/mac80211/rx.c | 3 +- net/mac80211/wpa.c | 3 +- net/wireless/mlme.c | 30 ++++++++++++++-------------- net/wireless/nl80211.c | 48 +++++++++++++++++++++++++-------------------- net/wireless/nl80211.h | 14 ++++++------- 9 files changed, 91 insertions(+), 66 deletions(-)
include/net/cfg80211.h +14 -7
@@ -1572,64 +1572,70 @@ void cfg80211_unlink_bss(struct wiphy *w* @dev: network device * @buf: authentication frame (header + body) * @len: length of the frame data +* @gfp: allocation flags * * This function is called whenever an authentication has been processed in * station mode. The driver is required to call either this function or * cfg80211_send_auth_timeout() to indicate the result of cfg80211_ops::auth() * call. */ -void cfg80211_send_rx_auth (struct net_device *dev,const u8 *buf,size_t len); +void cfg80211_send_rx_auth (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp);/** * cfg80211_send_auth_timeout - notification of timed out authentication * @dev: network device * @addr: The MAC address of the device with which the authentication timed out +* @gfp: allocation flags */ -void cfg80211_send_auth_timeout (struct net_device *dev,const u8 *addr); +void cfg80211_send_auth_timeout (struct net_device *dev,const u8 *addr,gfp_t gfp);/** * cfg80211_send_rx_assoc - notification of processed association * @dev: network device * @buf: (re)association response frame (header + body) * @len: length of the frame data +* @gfp: allocation flags * * This function is called whenever a (re)association response has been * processed in station mode. The driver is required to call either this * function or cfg80211_send_assoc_timeout() to indicate the result of * cfg80211_ops::assoc() call. */ -void cfg80211_send_rx_assoc (struct net_device *dev,const u8 *buf,size_t len); +void cfg80211_send_rx_assoc (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp);/** * cfg80211_send_assoc_timeout - notification of timed out association * @dev: network device * @addr: The MAC address of the device with which the association timed out +* @gfp: allocation flags */ -void cfg80211_send_assoc_timeout (struct net_device *dev,const u8 *addr); +void cfg80211_send_assoc_timeout (struct net_device *dev,const u8 *addr,gfp_t gfp);/** * cfg80211_send_deauth - notification of processed deauthentication * @dev: network device * @buf: deauthentication frame (header + body) * @len: length of the frame data +* @gfp: allocation flags * * This function is called whenever deauthentication has been processed in * station mode. This includes both received deauthentication frames and * locally generated ones. */ -void cfg80211_send_deauth (struct net_device *dev,const u8 *buf,size_t len); +void cfg80211_send_deauth (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp);/** * cfg80211_send_disassoc - notification of processed disassociation * @dev: network device * @buf: disassociation response frame (header + body) * @len: length of the frame data +* @gfp: allocation flags * * This function is called whenever disassociation has been processed in * station mode. This includes both received disassociation frames and locally * generated ones. */ -void cfg80211_send_disassoc (struct net_device *dev,const u8 *buf,size_t len); +void cfg80211_send_disassoc (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp);/** * cfg80211_hold_bss - exclude bss from expiration
@@ -1655,6 +1661,7 @@ void cfg80211_unhold_bss(struct cfg80211* @key_type: The key type that the received frame used * @key_id: Key identifier (0..3) * @tsc: The TSC value of the frame that generated the MIC failure (6 octets) +* @gfp: allocation flags * * This function is called whenever the local MAC detects a MIC failure in a * received frame. This matches with MLME-MICHAELMICFAILURE.indication()
@@ -1662,7 +1669,7 @@ void cfg80211_unhold_bss(struct cfg80211*/ void cfg80211_michael_mic_failure (struct net_device *dev,const u8 *addr,enum nl80211_key_type key_type,int key_id, -const u8 *tsc); +const u8 *tsc,gfp_t gfp);/** * cfg80211_ibss_joined - notify cfg80211 that device joined an IBSS
net/wireless/mlme.c +15 -15
@@ -12,35 +12,35 @@#include "core.h" #include "nl80211.h" -void cfg80211_send_rx_auth (struct net_device *dev,const u8 *buf,size_t len) +void cfg80211_send_rx_auth (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_rx_auth (rdev, dev, buf, len); +nl80211_send_rx_auth (rdev, dev, buf, len, gfp); }EXPORT_SYMBOL (cfg80211_send_rx_auth); -void cfg80211_send_rx_assoc (struct net_device *dev,const u8 *buf,size_t len) +void cfg80211_send_rx_assoc (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_rx_assoc (rdev, dev, buf, len); +nl80211_send_rx_assoc (rdev, dev, buf, len, gfp); }EXPORT_SYMBOL (cfg80211_send_rx_assoc); -void cfg80211_send_deauth (struct net_device *dev,const u8 *buf,size_t len) +void cfg80211_send_deauth (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_deauth (rdev, dev, buf, len); +nl80211_send_deauth (rdev, dev, buf, len, gfp); }EXPORT_SYMBOL (cfg80211_send_deauth); -void cfg80211_send_disassoc (struct net_device *dev,const u8 *buf,size_t len) +void cfg80211_send_disassoc (struct net_device *dev,const u8 *buf,size_t len,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_disassoc (rdev, dev, buf, len); +nl80211_send_disassoc (rdev, dev, buf, len, gfp); }EXPORT_SYMBOL (cfg80211_send_disassoc);
@@ -53,33 +53,33 @@ static void cfg80211_wext_disconnected(s#endif } -void cfg80211_send_auth_timeout (struct net_device *dev,const u8 *addr) +void cfg80211_send_auth_timeout (struct net_device *dev,const u8 *addr,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_auth_timeout (rdev, dev, addr); +nl80211_send_auth_timeout (rdev, dev, addr, gfp);cfg80211_wext_disconnected (dev); }EXPORT_SYMBOL (cfg80211_send_auth_timeout); -void cfg80211_send_assoc_timeout (struct net_device *dev,const u8 *addr) +void cfg80211_send_assoc_timeout (struct net_device *dev,const u8 *addr,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy); -nl80211_send_assoc_timeout (rdev, dev, addr); +nl80211_send_assoc_timeout (rdev, dev, addr, gfp);cfg80211_wext_disconnected (dev); }EXPORT_SYMBOL (cfg80211_send_assoc_timeout);void cfg80211_michael_mic_failure (struct net_device *dev,const u8 *addr,enum nl80211_key_type key_type,int key_id, -const u8 *tsc) +const u8 *tsc,gfp_t gfp) {struct wiphy *wiphy = dev->ieee80211_ptr->wiphy;struct cfg80211_registered_device *rdev =wiphy_to_dev (wiphy);#ifdef CONFIG_WIRELESS_EXT union iwreq_data wrqu; -char *buf =kmalloc (128 ,GFP_ATOMIC ); +char *buf =kmalloc (128 , gfp);if (buf) { sprintf(buf, "MLME-MICHAELMICFAILURE.indication("
@@ -93,6 +93,6 @@ void cfg80211_michael_mic_failure(struct }#endif -nl80211_michael_mic_failure (rdev, dev, addr, key_type, key_id, tsc); +nl80211_michael_mic_failure (rdev, dev, addr, key_type, key_id, tsc, gfp); }EXPORT_SYMBOL (cfg80211_michael_mic_failure);
net/wireless/nl80211.c +27 -21
130 lines not on this page · raw message
net/wireless/nl80211.h +7 -7
@@ -15,27 +15,27 @@ void nl80211_send_scan_aborted(struct cfvoid nl80211_send_reg_change_event (struct regulatory_request *request);void nl80211_send_rx_auth (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *buf,size_t len); +const u8 *buf,size_t len,gfp_t gfp);void nl80211_send_rx_assoc (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *buf,size_t len); +const u8 *buf,size_t len,gfp_t gfp);void nl80211_send_deauth (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *buf,size_t len); +const u8 *buf,size_t len,gfp_t gfp);void nl80211_send_disassoc (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *buf,size_t len); +const u8 *buf,size_t len,gfp_t gfp);void nl80211_send_auth_timeout (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *addr); +const u8 *addr,gfp_t gfp);void nl80211_send_assoc_timeout (struct cfg80211_registered_device *rdev,struct net_device *netdev, -const u8 *addr); +const u8 *addr,gfp_t gfp);void nl80211_michael_mic_failure (struct cfg80211_registered_device *rdev,struct net_device *netdev,const u8 *addr,enum nl80211_key_type key_type, -int key_id,const u8 *tsc); +int key_id,const u8 *tsc,gfp_t gfp); void nl80211_send_beacon_hint_event(struct wiphy *wiphy,
net/mac80211/mlme.c +19 -11
@@ -419,9 +419,11 @@ static void ieee80211_send_deauth_disass mgmt->u.deauth.reason_code =cpu_to_le16 (reason);if (stype ==IEEE80211_STYPE_DEAUTH ) -cfg80211_send_deauth (sdata->dev, (u8 *) mgmt, skb->len); +cfg80211_send_deauth (sdata->dev, (u8 *) mgmt, skb->len, +GFP_KERNEL );else -cfg80211_send_disassoc (sdata->dev, (u8 *) mgmt, skb->len); +cfg80211_send_disassoc (sdata->dev, (u8 *) mgmt, skb->len, +GFP_KERNEL );ieee80211_tx_skb (sdata, skb, ifmgd->flags &IEEE80211_STA_MFP_ENABLED ); }
@@ -1006,7 +1008,8 @@ static void ieee80211_direct_probe(struc sdata->dev->name, ifmgd->bssid); ifmgd->state =IEEE80211_STA_MLME_DISABLED ;ieee80211_recalc_idle (local); -cfg80211_send_auth_timeout (sdata->dev, ifmgd->bssid); +cfg80211_send_auth_timeout (sdata->dev, ifmgd->bssid, +GFP_KERNEL );/* * Most likely AP is not in the range so remove the
@@ -1055,7 +1058,8 @@ static void ieee80211_authenticate(struc sdata->dev->name, ifmgd->bssid); ifmgd->state =IEEE80211_STA_MLME_DISABLED ;ieee80211_recalc_idle (local); -cfg80211_send_auth_timeout (sdata->dev, ifmgd->bssid); +cfg80211_send_auth_timeout (sdata->dev, ifmgd->bssid, +GFP_KERNEL );ieee80211_rx_bss_remove (sdata, ifmgd->bssid, sdata->local->hw.conf.channel->center_freq, ifmgd->ssid, ifmgd->ssid_len);
@@ -1243,7 +1247,8 @@ static void ieee80211_associate(struct i sdata->dev->name, ifmgd->bssid); ifmgd->state =IEEE80211_STA_MLME_DISABLED ;ieee80211_recalc_idle (local); -cfg80211_send_assoc_timeout (sdata->dev, ifmgd->bssid); +cfg80211_send_assoc_timeout (sdata->dev, ifmgd->bssid, +GFP_KERNEL );ieee80211_rx_bss_remove (sdata, ifmgd->bssid, sdata->local->hw.conf.channel->center_freq, ifmgd->ssid, ifmgd->ssid_len);
@@ -1517,12 +1522,14 @@ static void ieee80211_rx_mgmt_auth(struccase WLAN_AUTH_LEAP :case WLAN_AUTH_FT :ieee80211_auth_completed (sdata); -cfg80211_send_rx_auth (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_rx_auth (sdata->dev, (u8 *) mgmt, len, +GFP_KERNEL );break ;case WLAN_AUTH_SHARED_KEY :if (ifmgd->auth_transaction ==4 ) {ieee80211_auth_completed (sdata); -cfg80211_send_rx_auth (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_rx_auth (sdata->dev, (u8 *) mgmt, len, +GFP_KERNEL ); }else ieee80211_auth_challenge (sdata, mgmt, len);break ;
@@ -1560,7 +1567,7 @@ static void ieee80211_rx_mgmt_deauth(strieee80211_set_disassoc (sdata, true, false,0 ); ifmgd->flags &= ~IEEE80211_STA_AUTHENTICATED ; -cfg80211_send_deauth (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_deauth (sdata->dev, (u8 *) mgmt, len,GFP_KERNEL ); }
@@ -1591,7 +1598,7 @@ static void ieee80211_rx_mgmt_disassoc(s }ieee80211_set_disassoc (sdata, false, false, reason_code); -cfg80211_send_disassoc (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_disassoc (sdata->dev, (u8 *) mgmt, len,GFP_KERNEL ); }
@@ -1660,7 +1667,8 @@ static void ieee80211_rx_mgmt_assoc_resp* association next time. This works around some broken APs * which do not correctly reject reassociation requests. */ ifmgd->flags &= ~IEEE80211_STA_PREV_BSSID_SET ; -cfg80211_send_rx_assoc (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_rx_assoc (sdata->dev, (u8 *) mgmt, len, +GFP_KERNEL );if (ifmgd->flags &IEEE80211_STA_EXT_SME ) {/* Wait for SME to decide what to do next */ ifmgd->state =IEEE80211_STA_MLME_DISABLED ;
@@ -1823,7 +1831,7 @@ static void ieee80211_rx_mgmt_assoc_resp ifmgd->last_beacon = jiffies;ieee80211_associated (sdata); -cfg80211_send_rx_assoc (sdata->dev, (u8 *) mgmt, len); +cfg80211_send_rx_assoc (sdata->dev, (u8 *) mgmt, len,GFP_KERNEL ); }
net/mac80211/event.c +3 -2
@@ -16,11 +16,12 @@* driver or is still in the frame), it should provide that information. */ void mac80211_ev_michael_mic_failure (struct ieee80211_sub_if_data *sdata,int keyidx, -struct ieee80211_hdr *hdr,const u8 *tsc) +struct ieee80211_hdr *hdr,const u8 *tsc, +gfp_t gfp) {cfg80211_michael_mic_failure (sdata->dev, hdr->addr2, (hdr->addr1[0 ] &0x01 ) ?NL80211_KEYTYPE_GROUP :NL80211_KEYTYPE_PAIRWISE , - keyidx, tsc); + keyidx, tsc, gfp); }
net/mac80211/ieee80211_i.h +2 -1
@@ -1085,7 +1085,8 @@ u8 *ieee80211_get_bssid(struct ieee80211int ieee80211_frame_duration (struct ieee80211_local *local,size_t len,int rate,int erp,int short_preamble);void mac80211_ev_michael_mic_failure (struct ieee80211_sub_if_data *sdata,int keyidx, -struct ieee80211_hdr *hdr,const u8 *tsc); +struct ieee80211_hdr *hdr,const u8 *tsc, +gfp_t gfp);void ieee80211_set_wmm_default (struct ieee80211_sub_if_data *sdata);void ieee80211_tx_skb (struct ieee80211_sub_if_data *sdata,struct sk_buff *skb,int encrypt);
net/mac80211/rx.c +2 -1
@@ -1868,7 +1868,8 @@ static void ieee80211_rx_michael_mic_rep !ieee80211_is_auth(hdr->frame_control)) goto ignore; -mac80211_ev_michael_mic_failure (rx->sdata, keyidx, hdr,NULL ); +mac80211_ev_michael_mic_failure (rx->sdata, keyidx, hdr,NULL , +GFP_ATOMIC ); ignore:dev_kfree_skb (rx->skb); rx->skb =NULL ;
net/mac80211/wpa.c +2 -1
@@ -122,7 +122,8 @@ ieee80211_rx_h_michael_mic_verify(structreturn RX_DROP_UNUSABLE ;mac80211_ev_michael_mic_failure (rx->sdata, rx->key->conf.keyidx, - (void *) skb->data,NULL ); + (void *) skb->data,NULL , +GFP_ATOMIC );return RX_DROP_UNUSABLE ; }
Johannes Berg
maintainerPATCH v4 7/20 cfg80211: remove wireless_dev->bssid
In reply to Johannes BergThis variable isn't necessary -- the wext code keeps track of the BSSID itself, and otherwise we have current_bss.
--- include/net/cfg80211.h | 1 - net/wireless/ibss.c | 13 +++---------- 2 files changed, 3 insertions(+), 11 deletions(-)
net/wireless/ibss.c +3 -10
@@ -24,9 +24,6 @@ void cfg80211_ibss_joined(struct net_devif (WARN_ON (!wdev->ssid_len))return ; -if (memcmp (bssid, wdev->bssid,ETH_ALEN ) ==0 ) -return ; - bss =cfg80211_get_bss (wdev->wiphy,NULL , bssid, wdev->ssid, wdev->ssid_len,WLAN_CAPABILITY_IBSS ,WLAN_CAPABILITY_IBSS );
@@ -41,7 +38,6 @@ void cfg80211_ibss_joined(struct net_devcfg80211_hold_bss (bss); wdev->current_bss = bss; -memcpy (wdev->bssid, bssid,ETH_ALEN );nl80211_send_ibss_bssid (wiphy_to_dev (wdev->wiphy), dev, bssid, gfp);#ifdef CONFIG_WIRELESS_EXT
@@ -87,7 +83,6 @@ void cfg80211_clear_ibss(struct net_devi wdev->current_bss =NULL ; wdev->ssid_len =0 ; -memset (wdev->bssid,0 ,ETH_ALEN );#ifdef CONFIG_WIRELESS_EXT if (!nowext) wdev->wext.ibss.ssid_len =0 ;
@@ -356,12 +351,10 @@ int cfg80211_ibss_wext_giwap(struct net_ ap_addr->sa_family =ARPHRD_ETHER ; -if (wdev->wext.ibss.bssid) { +if (wdev->current_bss) +memcpy (ap_addr->sa_data, wdev->current_bss->bssid,ETH_ALEN ); +else memcpy (ap_addr->sa_data, wdev->wext.ibss.bssid,ETH_ALEN ); -return 0 ; - } - -memcpy (ap_addr->sa_data, wdev->bssid,ETH_ALEN );return 0 ; }/* temporary symbol - mark GPL - in the future the handler won't be */
include/net/cfg80211.h +0 -1
@@ -1170,7 +1170,6 @@ struct wireless_dev {/* currently used for IBSS - might be rearranged in the future */ struct cfg80211_bss *current_bss; -u8 bssid[ETH_ALEN ];u8 ssid[IEEE80211_MAX_SSID_LEN ];u8 ssid_len;
Johannes Berg
maintainerPATCH v4 8/20 mac80211: tell SME about real auth state
In reply to Johannes BergWhen the auth algorithm is rejected, but we don't have another one to try, we will eventually retry but that isn't useful -- we'll then do it again and again until we eventually give up. Instead, we should let the SME know and go into disabled state. The same applies for situations where the AP rejects with any other status code.
Additionally, when trying the next auth algorithm, we should reset the auth_tries so that just a single lost frame doesn't lead to us giving up on the third auth algorithm.
--- net/mac80211/mlme.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
net/mac80211/mlme.c +7 -1
@@ -1511,9 +1511,15 @@ static void ieee80211_rx_mgmt_auth(struc !ieee80211_sta_wep_configured(sdata))continue ; ifmgd->auth_alg = algs[pos]; -break ; + ifmgd->auth_tries =0 ; +return ; } } +/* nothing else to try -- give up */ +cfg80211_send_rx_auth (sdata->dev, (u8 *) mgmt, len, +GFP_KERNEL ); + ifmgd->state =IEEE80211_STA_MLME_DISABLED ; +ieee80211_recalc_idle (sdata->local);return ; }
Johannes Berg
maintainerPATCH v4 9/20 wext: constify extra argument to wireless_send_event
In reply to Johannes BergThis is never changed by the function, so can be marked const.
--- include/net/iw_handler.h | 2 +- net/wireless/wext.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
include/net/iw_handler.h +1 -1
@@ -443,7 +443,7 @@ extern int dev_get_wireless_info(char *extern void wireless_send_event (struct net_device * dev,unsigned int cmd,union iwreq_data * wrqu, -char * extra); +const char * extra);/* We may need a function to send a stream of events to user space. * More on that later... */
net/wireless/wext.c +1 -1
@@ -1376,7 +1376,7 @@ static void rtmsg_iwinfo(struct net_devivoid wireless_send_event (struct net_device * dev,unsigned int cmd,union iwreq_data * wrqu, -char * extra) +const char * extra) {const struct iw_ioctl_description * descr =NULL ;int extra_len =0 ;
Johannes Berg
maintainerPATCH v4 10/20 cfg80211: introduce nl80211 testmode command
In reply to Johannes BergThis introduces a new NL80211_CMD_TESTMODE for testing and calibration use with nl80211. There's no multiplexing like like iwpriv had, and the command is not available by default, it needs to be explicitly enabled in Kconfig and shouldn't be enabled in most kernels.
The command requires a wiphy index or interface index to identify the device to operate on, and the new TESTDATA attribute. There also is API for sending replies to the command, and testmode multicast messages (on a testmode multicast group).
I've also updated mac80211 to be able to pass through the command to the driver, since it itself doesn't implement the testmode command.
Additionally, to give people an idea of how to use the command, I've added a little code to hwsim that makes use of the new command to set the powersave mode, this is currently done via debugfs and should remain there, and the testmode command only serves as an example of how to use this best -- with nested netlink attributes in the TESTDATA attribute. A hwsim testmode tool can be found at
http://git.sipsolutions.net/hwsim.git/. This tool is BSD licensed so people can easily use it as a basis for their own internal fabrication and validation tools.
---
I haven't implemented dumping because right now I'm not sure how to, nor whether people will use it when they can allocate larger skbs for more data which in test environments should be acceptable.
drivers/net/wireless/mac80211_hwsim.c | 68 +++++++++++++++++ include/linux/nl80211.h | 11 ++ include/net/cfg80211.h | 83 ++++++++++++++++++++ include/net/mac80211.h | 5 + net/mac80211/cfg.c | 13 +++ net/wireless/Kconfig | 15 +++ net/wireless/core.h | 4 + net/wireless/nl80211.c | 136 ++++++++++++++++++++++++++++++++++ 8 files changed, 335 insertions(+)
include/linux/nl80211.h +11 -0
@@ -242,6 +242,10 @@* @NL80211_CMD_LEAVE_IBSS: Leave the IBSS -- no special arguments, the IBSS is * determined by the network interface. * +* @NL80211_CMD_TESTMODE: testmode command, takes a wiphy (or ifindex) attribute +* to identify the device, and the TESTDATA blob attribute to pass through +* to the driver. +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -310,6 +314,8 @@ enum nl80211_commands {NL80211_CMD_JOIN_IBSS ,NL80211_CMD_LEAVE_IBSS , + NL80211_CMD_TESTMODE, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -511,6 +517,9 @@ enum nl80211_commands {* authorized by user space. Otherwise, port is marked authorized by * default in station mode. * +* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. +* We recommend using nested, driver-specific attributes within this. +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -619,6 +628,8 @@ enum nl80211_attrs {NL80211_ATTR_CONTROL_PORT , +NL80211_ATTR_TESTDATA , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
include/net/cfg80211.h +83 -0
99 lines not on this page · raw message
net/wireless/Kconfig +15 -0
@@ -2,6 +2,21 @@ config CFG80211 tristate "Improved wireless configuration API" depends on RFKILL || !RFKILL +config NL80211_TESTMODE + bool "nl80211 testmode command" + depends on CFG80211 + help + The nl80211 testmode command helps implementing things like + factory calibration or validation tools for wireless chips. + + Select this option ONLY for kernels that are specifically + built for such purposes. + + Debugging tools that are supposed to end up in the hands of + users should better be implemented with debugfs. + + Say N. + config CFG80211_REG_DEBUG bool "cfg80211 regulatory debugging" depends on CFG80211
net/wireless/core.h +4 -0
@@ -58,6 +58,10 @@ struct cfg80211_registered_device {struct cfg80211_scan_request *scan_req;/* protected by RTNL */ unsigned long suspend_at; +#ifdef CONFIG_NL80211_TESTMODE +struct genl_info *testmode_info; +#endif +#ifdef CONFIG_CFG80211_DEBUGFS /* Debugfs entries */ struct wiphy_debugfsdentries {
net/wireless/nl80211.c +136 -0
154 lines not on this page · raw message
include/net/mac80211.h +5 -0
@@ -1419,6 +1419,8 @@ enum ieee80211_ampdu_mlme_action {* @rfkill_poll: Poll rfkill hardware state. If you need this, you also * need to set wiphy->rfkill_poll to %true before registration, * and need to call wiphy_rfkill_set_hw_state() in the callback. +* +* @testmode_cmd: Implement a cfg80211 test mode command. */ struct ieee80211_ops {int (*tx)(struct ieee80211_hw *hw,struct sk_buff *skb);
@@ -1469,6 +1471,9 @@ struct ieee80211_ops { struct ieee80211_sta *sta, u16 tid, u16 *ssn);void (*rfkill_poll)(struct ieee80211_hw *hw); +#ifdef CONFIG_NL80211_TESTMODE +int (*testmode_cmd)(struct ieee80211_hw *hw,void *data,int len); +#endif };/**
net/mac80211/cfg.c +13 -0
@@ -1376,6 +1376,18 @@ static void ieee80211_rfkill_poll(structdrv_rfkill_poll (local); } +#ifdef CONFIG_NL80211_TESTMODE +int ieee80211_testmode_cmd (struct wiphy *wiphy,void *data,int len) +{ +struct ieee80211_local *local =wiphy_priv (wiphy); + +if (!local->ops->testmode_cmd) +return -EOPNOTSUPP ; + +return local->ops->testmode_cmd (&local->hw, data, len); +} +#endif +struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -1418,4 +1430,5 @@ struct cfg80211_ops mac80211_config_ops .set_tx_power = ieee80211_set_tx_power, .get_tx_power = ieee80211_get_tx_power, .rfkill_poll = ieee80211_rfkill_poll, + CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) };
drivers/net/wireless/mac80211_hwsim.c +68 -0
80 lines not on this page · raw message
Johannes Berg
maintainerPATCH v4 11/20 mac80211: remove an unused function declaration
In reply to Johannes BergThe ieee80211_scan_results function hasn't existed for a long time now, so its declaration should be removed as well.
--- net/mac80211/ieee80211_i.h | 3 --- 1 file changed, 3 deletions(-)
net/mac80211/ieee80211_i.h +0 -3
@@ -979,9 +979,6 @@ int ieee80211_request_internal_scan(stru const u8 *ssid, u8 ssid_len);int ieee80211_request_scan (struct ieee80211_sub_if_data *sdata,struct cfg80211_scan_request *req); -int ieee80211_scan_results (struct ieee80211_local *local, -struct iw_request_info *info, -char *buf,size_t len);void ieee80211_scan_cancel (struct ieee80211_local *local);ieee80211_rx_result ieee80211_scan_rx (struct ieee80211_sub_if_data *sdata,struct sk_buff *skb);
Johannes Berg
maintainerPATCH v4 12/20 wireless: define AKM suites
In reply to Johannes BergWe'll need these values for some drivers using connect API and for wext compat code, so let's define them.
--- include/linux/ieee80211.h | 4 ++++ 1 file changed, 4 insertions(+)
include/linux/ieee80211.h +4 -0
@@ -1196,6 +1196,10 @@ enum ieee80211_sa_query_action {#define WLAN_CIPHER_SUITE_WEP104 0x000FAC05#define WLAN_CIPHER_SUITE_AES_CMAC 0x000FAC06 +/* AKM suite selectors */ +#define WLAN_AKM_SUITE_8021X 0x000FAC01 +#define WLAN_AKM_SUITE_PSK 0x000FAC02 +#define WLAN_MAX_KEY_LEN 32/**
Johannes Berg
maintainerPATCH v4 13/20 cfg80211: connect/disconnect API
In reply to Johannes BergFrom: Samuel Ortiz <[email protected]>
This patch introduces the cfg80211 connect/disconnect API. The goal here is to run the AUTH and ASSOC steps in one call. This is needed for some fullmac cards that run both steps directly from the target, after the host driver sends a connect command.
Additionally, all the new crypto parameters for connect() are now also valid for associate() -- although associate requires the IEs to be used, the information can be useful for drivers and should be given.
--- include/linux/nl80211.h | 80 ++++++++++ include/net/cfg80211.h | 135 ++++++++++++++++- net/mac80211/cfg.c | 2 net/wireless/Makefile | 2 net/wireless/core.c | 16 +- net/wireless/core.h | 7 net/wireless/nl80211.c | 368 +++++++++++++++++++++++++++++++++++++++++++++++- net/wireless/nl80211.h | 13 + net/wireless/sme.c | 224 +++++++++++++++++++++++++++++ 9 files changed, 829 insertions(+), 18 deletions(-)
include/linux/nl80211.h +80 -0
@@ -246,6 +246,22 @@* to identify the device, and the TESTDATA blob attribute to pass through * to the driver. * +* @NL80211_CMD_CONNECT: connection request and notification; this command +* requests to connect to a specified network but without separating +* auth and assoc steps. For this, you need to specify the SSID in a +* %NL80211_ATTR_SSID attribute, and can optionally specify the association +* IEs in %NL80211_ATTR_IE, %NL80211_ATTR_AUTH_TYPE, %NL80211_ATTR_MAC, +* %NL80211_ATTR_WIPHY_FREQ and %NL80211_ATTR_CONTROL_PORT. +* It is also sent as an event, with the BSSID and response IEs when the +* connection is established or failed to be established. This can be +* determined by the STATUS_CODE attribute. +* @NL80211_CMD_ROAM: request that the card roam (currently not implemented), +* sent as an event when the card/driver roamed by itself. +* @NL80211_CMD_DISCONNECT: drop a given connection; also used to notify +* userspace that a connection was dropped by the AP or due to other +* reasons, for this the %NL80211_ATTR_DISCONNECTED_BY_AP and +* %NL80211_ATTR_REASON_CODE attributes are used. +* * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */
@@ -316,6 +332,10 @@ enum nl80211_commands {NL80211_CMD_TESTMODE , +NL80211_CMD_CONNECT , +NL80211_CMD_ROAM , + NL80211_CMD_DISCONNECT, +/* add new commands above here */ /* used to define NL80211_CMD_MAX below */
@@ -520,6 +540,30 @@ enum nl80211_commands {* @NL80211_ATTR_TESTDATA: Testmode data blob, passed through to the driver. * We recommend using nested, driver-specific attributes within this. * +* @NL80211_ATTR_DISCONNECTED_BY_AP: A flag indicating that the DISCONNECT +* event was due to the AP disconnecting the station, and not due to +* a local disconnect request. +* @NL80211_ATTR_STATUS_CODE: StatusCode for the %NL80211_CMD_CONNECT +* event (u16) +* @NL80211_ATTR_PRIVACY: Flag attribute, used with connect(), indicating +* that protected APs should be used. +* +* @NL80211_ATTR_CIPHERS_PAIRWISE: Used with CONNECT and ASSOCIATE to +* indicate which unicast key ciphers will be used with the connection +* (an array of u32). +* @NL80211_ATTR_CIPHER_GROUP: Used with CONNECT and ASSOCIATE to indicate +* which group key cipher will be used with the connection (a u32). +* @NL80211_ATTR_WPA_VERSIONS: Used with CONNECT and ASSOCIATE to indicate +* which WPA version(s) the AP we want to associate with is using +* (a u32 with flags from &enum nl80211_wpa_versions). +* @NL80211_ATTR_AKM_SUITES: Used with CONNECT and ASSOCIATE to indicate +* which key management algorithm(s) to use (an array of u32). +* +* @NL80211_ATTR_REQ_IE: (Re)association request information elements as +* sent out by the card, for ROAM and successful CONNECT events. +* @NL80211_ATTR_RESP_IE: (Re)association response information elements as +* sent by peer, for ROAM and successful CONNECT events. +* * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use */
@@ -630,6 +674,19 @@ enum nl80211_attrs {NL80211_ATTR_TESTDATA , +NL80211_ATTR_PRIVACY , + +NL80211_ATTR_DISCONNECTED_BY_AP , +NL80211_ATTR_STATUS_CODE , + +NL80211_ATTR_CIPHER_SUITES_PAIRWISE , +NL80211_ATTR_CIPHER_SUITE_GROUP , +NL80211_ATTR_WPA_VERSIONS , +NL80211_ATTR_AKM_SUITES , + +NL80211_ATTR_REQ_IE , +NL80211_ATTR_RESP_IE , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
@@ -640,6 +697,7 @@ enum nl80211_attrs {* Allow user space programs to use #ifdef on new attributes by defining them * here */ +#define NL80211_CMD_CONNECT NL80211_CMD_CONNECT#define NL80211_ATTR_HT_CAPABILITY NL80211_ATTR_HT_CAPABILITY#define NL80211_ATTR_BSS_BASIC_RATES NL80211_ATTR_BSS_BASIC_RATES#define NL80211_ATTR_WIPHY_TXQ_PARAMS NL80211_ATTR_WIPHY_TXQ_PARAMS
@@ -653,6 +711,10 @@ enum nl80211_attrs {#define NL80211_ATTR_SSID NL80211_ATTR_SSID#define NL80211_ATTR_AUTH_TYPE NL80211_ATTR_AUTH_TYPE#define NL80211_ATTR_REASON_CODE NL80211_ATTR_REASON_CODE +#define NL80211_ATTR_CIPHER_SUITES_PAIRWISE NL80211_ATTR_CIPHER_SUITES_PAIRWISE +#define NL80211_ATTR_CIPHER_SUITE_GROUP NL80211_ATTR_CIPHER_SUITE_GROUP +#define NL80211_ATTR_WPA_VERSIONS NL80211_ATTR_WPA_VERSIONS +#define NL80211_ATTR_AKM_SUITES NL80211_ATTR_AKM_SUITES#define NL80211_MAX_SUPP_RATES 32#define NL80211_MAX_SUPP_REG_RULES 32
@@ -661,6 +723,9 @@ enum nl80211_attrs {#define NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY 24#define NL80211_HT_CAPABILITY_LEN 26 +#define NL80211_MAX_NR_CIPHER_SUITES 5 +#define NL80211_MAX_NR_AKM_SUITES 2 +/** * enum nl80211_iftype - (virtual) interface types *
@@ -1205,12 +1270,22 @@ enum nl80211_bss {* @NL80211_AUTHTYPE_SHARED_KEY: Shared Key authentication (WEP only) * @NL80211_AUTHTYPE_FT: Fast BSS Transition (IEEE 802.11r) * @NL80211_AUTHTYPE_NETWORK_EAP: Network EAP (some Cisco APs and mainly LEAP) +* @__NL80211_AUTHTYPE_NUM: internal +* @NL80211_AUTHTYPE_MAX: maximum valid auth algorithm +* @NL80211_AUTHTYPE_AUTOMATIC: determine automatically (if necessary by +* trying multiple times); this is invalid in netlink -- leave out +* the attribute for this on CONNECT commands. */ enum nl80211_auth_type {NL80211_AUTHTYPE_OPEN_SYSTEM ,NL80211_AUTHTYPE_SHARED_KEY ,NL80211_AUTHTYPE_FT ,NL80211_AUTHTYPE_NETWORK_EAP , + +/* keep last */ + __NL80211_AUTHTYPE_NUM, +NL80211_AUTHTYPE_MAX = __NL80211_AUTHTYPE_NUM -1 , +NL80211_AUTHTYPE_AUTOMATIC };/**
@@ -1235,4 +1310,9 @@ enum nl80211_mfp { NL80211_MFP_REQUIRED, }; +enum nl80211_wpa_versions { +NL80211_WPA_VERSION_1 =1 <<0 , +NL80211_WPA_VERSION_2 =1 <<1 , +}; +#endif /* __LINUX_NL80211_H */
include/net/cfg80211.h +129 -6
184 lines not on this page · raw message
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 scan.o nl80211.o mlme.o ibss.o +cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o sme.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o
net/wireless/core.h +7 -0
@@ -174,6 +174,13 @@ void cfg80211_clear_ibss(struct net_deviint cfg80211_leave_ibss (struct cfg80211_registered_device *rdev,struct net_device *dev,bool nowext); +/* SME */ +int cfg80211_connect (struct cfg80211_registered_device *rdev, +struct net_device *dev, +struct cfg80211_connect_params *connect); +int cfg80211_disconnect (struct cfg80211_registered_device *rdev, +struct net_device *dev,u16 reason); +/* internal helpers */ int cfg80211_validate_key_settings (struct key_params *params,int key_idx,const u8 *mac_addr);
net/wireless/nl80211.c +361 -7
418 lines not on this page · raw message
net/wireless/sme.c new file +224 -0
224 lines not on this page · raw message
net/wireless/core.c +13 -3
@@ -546,6 +546,7 @@ static int cfg80211_netdev_notifier_call "symlink to netdev!\n"); } wdev->netdev = dev; + wdev->sme_state =CFG80211_SME_IDLE ;#ifdef CONFIG_WIRELESS_EXT wdev->wext.default_key =-1 ; wdev->wext.default_mgmt_key =-1 ;
@@ -553,11 +554,20 @@ static int cfg80211_netdev_notifier_callmutex_unlock (&rdev->devlist_mtx);break ;case NETDEV_GOING_DOWN : -if (wdev->iftype !=NL80211_IFTYPE_ADHOC ) -break ;if (!wdev->ssid_len)break ; -cfg80211_leave_ibss (rdev, dev, true); + +switch (wdev->iftype) { +case NL80211_IFTYPE_ADHOC : +cfg80211_leave_ibss (rdev, dev, true); +break ; +case NL80211_IFTYPE_STATION : +cfg80211_disconnect (rdev, dev, +WLAN_REASON_DEAUTH_LEAVING ); +break ; +default : +break ; + }break ;case NETDEV_UP :#ifdef CONFIG_WIRELESS_EXT
net/wireless/nl80211.h +13 -0
@@ -31,6 +31,19 @@ void nl80211_send_auth_timeout(struct cfvoid nl80211_send_assoc_timeout (struct cfg80211_registered_device *rdev,struct net_device *netdev,const u8 *addr,gfp_t gfp); +void nl80211_send_connect_result (struct cfg80211_registered_device *rdev, +struct net_device *netdev,const u8 *bssid, +const u8 *req_ie,size_t req_ie_len, +const u8 *resp_ie,size_t resp_ie_len, +u16 status,gfp_t gfp); +void nl80211_send_roamed (struct cfg80211_registered_device *rdev, +struct net_device *netdev,const u8 *bssid, +const u8 *req_ie,size_t req_ie_len, +const u8 *resp_ie,size_t resp_ie_len,gfp_t gfp); +void nl80211_send_disconnected (struct cfg80211_registered_device *rdev, +struct net_device *netdev,u16 reason, +u8 *ie,size_t ie_len,bool from_ap,gfp_t gfp); + void nl80211_michael_mic_failure(struct cfg80211_registered_device *rdev, struct net_device *netdev, const u8 *addr,
net/mac80211/cfg.c +1 -1
@@ -1262,7 +1262,7 @@ static int ieee80211_assoc(struct wiphy sdata->u.mgd.flags &= ~IEEE80211_STA_MFP_ENABLED ; } -if (req->control_port) +if (req->crypto.control_port) sdata->u.mgd.flags |=IEEE80211_STA_CONTROL_PORT ;else sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT ;
Johannes Berg
maintainerPATCH v4 14/20 cfg80211: emulate connect with auth/assoc
In reply to Johannes BergThis adds code to cfg80211 so that drivers (mac80211 right now) that don't implement connect but rather auth/assoc can still be used with the nl80211 connect command. This will also be necessary for the wext compat code.
---
v4: dynamically allocate conn data
include/net/cfg80211.h | 6 net/wireless/core.c | 7 net/wireless/core.h | 8 + net/wireless/mlme.c | 81 ++++++++-- net/wireless/nl80211.c | 4 net/wireless/scan.c | 7 net/wireless/sme.c | 390 +++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 471 insertions(+), 32 deletions(-)
net/wireless/core.h +8 -0
@@ -62,6 +62,8 @@ struct cfg80211_registered_device {struct genl_info *testmode_info;#endif +struct work_struct conn_work; +#ifdef CONFIG_CFG80211_DEBUGFS /* Debugfs entries */ struct wiphy_debugfsdentries {
@@ -181,8 +183,14 @@ int cfg80211_connect(struct cfg80211_regint cfg80211_disconnect (struct cfg80211_registered_device *rdev,struct net_device *dev,u16 reason); +void cfg80211_conn_work (struct work_struct *work); +/* internal helpers */ int cfg80211_validate_key_settings (struct key_params *params,int key_idx,const u8 *mac_addr); +void __cfg80211_disconnected (struct net_device *dev,gfp_t gfp,u8 *ie, +size_t ie_len,u16 reason,bool from_ap); +void cfg80211_sme_scan_done (struct net_device *dev); +void cfg80211_sme_rx_auth (struct net_device *dev,const u8 *buf,size_t len);#endif /* __NET_WIRELESS_CORE_H */
net/wireless/nl80211.c +2 -2
@@ -351,12 +351,12 @@ static int nl80211_send_wiphy(struct sk_#undef CMD -if (dev->ops->connect) { +if (dev->ops->connect || dev->ops->auth) { i++;NLA_PUT_U32 (msg, i,NL80211_CMD_CONNECT ); } -if (dev->ops->disconnect) { +if (dev->ops->disconnect || dev->ops->deauth) { i++;NLA_PUT_U32 (msg, i,NL80211_CMD_DISCONNECT ); }
net/wireless/sme.c +378 -12
454 lines not on this page · raw message
net/wireless/mlme.c +64 -17
122 lines not on this page · raw message
net/wireless/core.c +7 -0
@@ -321,6 +321,7 @@ struct wiphy *wiphy_new(const struct cfg }INIT_WORK (&drv->rfkill_sync, cfg80211_rfkill_sync_work); +INIT_WORK (&drv->conn_work, cfg80211_conn_work);/* * Initialize wiphy parameters to IEEE 802.11 MIB default values.
@@ -481,6 +482,8 @@ void wiphy_unregister(struct wiphy *wiph/* unlock again before freeing */ mutex_unlock (&drv->mtx); +cancel_work_sync (&drv->conn_work); +cfg80211_debugfs_drv_del (drv);/* If this device got a regulatory hint tell core its
@@ -569,6 +572,10 @@ static int cfg80211_netdev_notifier_callbreak ; }break ; +case NETDEV_DOWN : +kfree (wdev->conn); + wdev->conn =NULL ; +break ;case NETDEV_UP :#ifdef CONFIG_WIRELESS_EXT if (wdev->iftype !=NL80211_IFTYPE_ADHOC )
include/net/cfg80211.h +5 -1
@@ -1209,6 +1209,9 @@ extern void wiphy_unregister(struct wiph*/ extern void wiphy_free (struct wiphy *wiphy); +/* internal struct */ +struct cfg80211_conn ; +/** * struct wireless_dev - wireless per-netdev state *
@@ -1242,9 +1245,10 @@ struct wireless_dev {u8 ssid_len;enum {CFG80211_SME_IDLE , -CFG80211_SME_CONNECTING ,/* ->connect called */ +CFG80211_SME_CONNECTING ,CFG80211_SME_CONNECTED , } sme_state; +struct cfg80211_conn *conn;#ifdef CONFIG_WIRELESS_EXT /* wext data */
net/wireless/scan.c +7 -0
@@ -30,6 +30,13 @@ void cfg80211_scan_done(struct cfg80211_WARN_ON (request !=wiphy_to_dev (request->wiphy)->scan_req); +/* +* This must be before sending the other events! +* Otherwise, wpa_supplicant gets completely confused with +* wext events. +*/ +cfg80211_sme_scan_done (dev); +if (aborted)nl80211_send_scan_aborted (wiphy_to_dev (request->wiphy), dev);else
Johannes Berg
maintainerPATCH v4 15/20 cfg80211: managed mode wext compatibility
In reply to Johannes BergThis adds code to make it possible to use the cfg80211 connect() API with wireless extensions, and because the previous patch added emulation of that API with auth() and assoc(), by extension also supports wext on that. At the same time, removes code from mac80211 for wext, but doesn't yet clean up mac80211's mlme code more.
--- include/net/cfg80211.h | 36 ++++ net/mac80211/mlme.c | 69 --------- net/mac80211/wext.c | 215 ++--------------------------- net/wireless/Makefile | 2 net/wireless/core.c | 23 ++- net/wireless/core.h | 3 net/wireless/nl80211.c | 2 net/wireless/sme.c | 55 ++++--- net/wireless/wext-compat.c | 229 +++++++++++++++++++++++++------ net/wireless/wext-sme.c | 329 +++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 625 insertions(+), 338 deletions(-)
include/net/cfg80211.h +35 -1
@@ -1253,8 +1253,14 @@ struct wireless_dev {#ifdef CONFIG_WIRELESS_EXT /* wext data */ struct { -struct cfg80211_ibss_params ibss; +union { +struct cfg80211_ibss_params ibss; +struct cfg80211_connect_params connect; + }; +u8 *ie; +size_t ie_len;u8 bssid[ETH_ALEN ]; +u8 ssid[IEEE80211_MAX_SSID_LEN ];s8 default_key, default_mgmt_key; } wext;#endif
@@ -1535,6 +1541,34 @@ int cfg80211_ibss_wext_giwap(struct net_struct iw_request_info *info, struct sockaddr *ap_addr, char *extra); +int cfg80211_mgd_wext_siwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); +int cfg80211_mgd_wext_giwfreq (struct net_device *dev, +struct iw_request_info *info, +struct iw_freq *freq,char *extra); +int cfg80211_mgd_wext_siwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); +int cfg80211_mgd_wext_giwessid (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *ssid); +int cfg80211_mgd_wext_siwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); +int cfg80211_mgd_wext_giwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *ap_addr,char *extra); +int cfg80211_wext_siwgenie (struct net_device *dev, +struct iw_request_info *info, +struct iw_point *data,char *extra); +int cfg80211_wext_siwauth (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *data,char *extra); +int cfg80211_wext_giwauth (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *data,char *extra); +struct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy,struct iw_freq *freq);
net/wireless/Makefile +1 -1
@@ -7,6 +7,6 @@ obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o mlme.o ibss.o sme.o cfg80211-$(CONFIG_CFG80211_DEBUGFS) += debugfs.o -cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o +cfg80211-$(CONFIG_WIRELESS_EXT) += wext-compat.o wext-sme.o ccflags-y += -D__CHECK_ENDIAN__
net/wireless/wext-sme.c new file +329 -0
329 lines not on this page · raw message
net/wireless/core.c +19 -4
@@ -553,6 +553,7 @@ static int cfg80211_netdev_notifier_call#ifdef CONFIG_WIRELESS_EXT wdev->wext.default_key =-1 ; wdev->wext.default_mgmt_key =-1 ; + wdev->wext.connect.auth_type =NL80211_AUTHTYPE_AUTOMATIC ;#endif mutex_unlock (&rdev->devlist_mtx);break ;
@@ -565,8 +566,13 @@ static int cfg80211_netdev_notifier_callcfg80211_leave_ibss (rdev, dev, true);break ;case NL80211_IFTYPE_STATION : +#ifdef CONFIG_WIRELESS_EXT +kfree (wdev->wext.ie); + wdev->wext.ie =NULL ; + wdev->wext.ie_len =0 ; +#endif cfg80211_disconnect (rdev, dev, -WLAN_REASON_DEAUTH_LEAVING ); +WLAN_REASON_DEAUTH_LEAVING , true);break ;default :break ;
@@ -578,11 +584,20 @@ static int cfg80211_netdev_notifier_callbreak ;case NETDEV_UP :#ifdef CONFIG_WIRELESS_EXT -if (wdev->iftype !=NL80211_IFTYPE_ADHOC ) +switch (wdev->iftype) { +case NL80211_IFTYPE_ADHOC : +if (wdev->wext.ibss.ssid_len) +cfg80211_join_ibss (rdev, dev, + &wdev->wext.ibss);break ; -if (!wdev->wext.ibss.ssid_len) +case NL80211_IFTYPE_STATION : +if (wdev->wext.connect.ssid_len) +cfg80211_connect (rdev, dev, + &wdev->wext.connect); +break ; +default :break ; -cfg80211_join_ibss (rdev, dev, &wdev->wext.ibss); + }#endif break ;case NETDEV_UNREGISTER :
net/mac80211/wext.c +20 -195
295 lines not on this page · raw message
net/mac80211/mlme.c +0 -69
93 lines not on this page · raw message
net/wireless/wext-compat.c +185 -44
238 lines not on this page · raw message
net/wireless/core.h +2 -1
@@ -181,7 +181,8 @@ int cfg80211_connect(struct cfg80211_regstruct net_device *dev, struct cfg80211_connect_params *connect);int cfg80211_disconnect (struct cfg80211_registered_device *rdev, -struct net_device *dev,u16 reason); +struct net_device *dev,u16 reason, +bool wextev);void cfg80211_conn_work (struct work_struct *work);
net/wireless/nl80211.c +1 -1
@@ -3746,7 +3746,7 @@ static int nl80211_disconnect(struct sk_ goto out; } - err =cfg80211_disconnect (drv, dev, reason); + err =cfg80211_disconnect (drv, dev, reason, true); out:cfg80211_put_dev (drv);
net/wireless/sme.c +33 -22
84 lines not on this page · raw message
Johannes Berg
maintainerPATCH v4 16/20 cfg80211: implement iwpower
In reply to Johannes BergJust on/off and timeout, and with a hacky cfg80211 method until we figure out what we want, though this is probably sufficient as we want to use pm_qos for wifi everywhere.
--- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 22 ++++++++ drivers/net/wireless/iwmc3200wifi/wext.c | 47 ------------------ include/net/cfg80211.h | 13 +++++ net/mac80211/Kconfig | 16 ------ net/mac80211/cfg.c | 26 ++++++++++ net/mac80211/mlme.c | 5 - net/mac80211/wext.c | 70 --------------------------- net/wireless/Kconfig | 16 ++++++ net/wireless/core.c | 11 +++- net/wireless/wext-compat.c | 60 +++++++++++++++++++++++ 10 files changed, 151 insertions(+), 135 deletions(-)
include/net/cfg80211.h +13 -0
@@ -1023,6 +1023,10 @@ struct cfg80211_ops {#ifdef CONFIG_NL80211_TESTMODE int (*testmode_cmd)(struct wiphy *wiphy,void *data,int len);#endif + +/* some temporary stuff to finish wext */ +int (*set_power_mgmt)(struct wiphy *wiphy,struct net_device *dev, +bool enabled,int timeout); };/*
@@ -1262,6 +1266,8 @@ struct wireless_dev {u8 bssid[ETH_ALEN ];u8 ssid[IEEE80211_MAX_SSID_LEN ];s8 default_key, default_mgmt_key; +bool ps; + int ps_timeout; } wext;#endif };
@@ -1606,6 +1612,13 @@ int cfg80211_wext_giwtxpower(struct net_struct iw_request_info *info, union iwreq_data *data, char *keybuf); +int cfg80211_wext_siwpower (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *wrq,char *extra); +int cfg80211_wext_giwpower (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *wrq,char *extra); +/* * callbacks for asynchronous cfg80211 methods, notification * functions and BSS handling helpers
net/mac80211/Kconfig +0 -16
@@ -14,22 +14,6 @@ config MAC80211 comment "CFG80211 needs to be enabled for MAC80211" depends on CFG80211=n -config MAC80211_DEFAULT_PS - bool "enable powersave by default" - depends on MAC80211 - default y - help - This option enables powersave mode by default. - - If this causes your applications to misbehave you should fix your - applications instead -- they need to register their network - latency requirement, see Documentation/power/pm_qos_interface.txt. - -config MAC80211_DEFAULT_PS_VALUE - int - default 1 if MAC80211_DEFAULT_PS - default 0 - menu "Rate control algorithm selection" depends on MAC80211 != n
net/mac80211/wext.c +2 -68
82 lines not on this page · raw message
net/wireless/Kconfig +16 -0
@@ -26,6 +26,22 @@ config CFG80211_REG_DEBUG If unsure, say N. +config CFG80211_DEFAULT_PS + bool "enable powersave by default" + depends on CFG80211 + default y + help + This option enables powersave mode by default. + + If this causes your applications to misbehave you should fix your + applications instead -- they need to register their network + latency requirement, see Documentation/power/pm_qos_interface.txt. + +config CFG80211_DEFAULT_PS_VALUE + int + default 1 if CFG80211_DEFAULT_PS + default 0 + config CFG80211_DEBUGFS bool "cfg80211 DebugFS entries" depends on CFG80211 && DEBUG_FS
net/wireless/core.c +10 -1
@@ -550,12 +550,21 @@ static int cfg80211_netdev_notifier_call } wdev->netdev = dev; wdev->sme_state =CFG80211_SME_IDLE ; +mutex_unlock (&rdev->devlist_mtx);#ifdef CONFIG_WIRELESS_EXT wdev->wext.default_key =-1 ; wdev->wext.default_mgmt_key =-1 ; wdev->wext.connect.auth_type =NL80211_AUTHTYPE_AUTOMATIC ; + wdev->wext.ps =CONFIG_CFG80211_DEFAULT_PS_VALUE ; + wdev->wext.ps_timeout =500 ; +if (rdev->ops->set_power_mgmt) +if (rdev->ops->set_power_mgmt (wdev->wiphy, dev, + wdev->wext.ps, + wdev->wext.ps_timeout)) { +/* assume this means it's off */ + wdev->wext.ps = false; + }#endif -mutex_unlock (&rdev->devlist_mtx);break ;case NETDEV_GOING_DOWN :if (!wdev->ssid_len)
net/wireless/wext-compat.c +60 -0
63 lines not on this page · raw message
net/mac80211/cfg.c +26 -0
@@ -1388,6 +1388,31 @@ int ieee80211_testmode_cmd(struct wiphy }#endif +static int ieee80211_set_power_mgmt (struct wiphy *wiphy,struct net_device *dev, +bool enabled,int timeout) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); +struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); +struct ieee80211_conf *conf = &local->hw.conf; + +if (!(local->hw.flags &IEEE80211_HW_SUPPORTS_PS )) +return -EOPNOTSUPP ; + +if (enabled == sdata->u.mgd.powersave && + timeout == conf->dynamic_ps_timeout) +return 0 ; + + sdata->u.mgd.powersave = enabled; + conf->dynamic_ps_timeout = timeout; + +if (local->hw.flags &IEEE80211_HW_SUPPORTS_DYNAMIC_PS ) +ieee80211_hw_config (local,IEEE80211_CONF_CHANGE_PS ); + +ieee80211_recalc_ps (local,-1 ); + +return 0 ; +} +struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface,
@@ -1431,4 +1456,5 @@ struct cfg80211_ops mac80211_config_ops .get_tx_power = ieee80211_get_tx_power, .rfkill_poll = ieee80211_rfkill_poll, CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd) + .set_power_mgmt = ieee80211_set_power_mgmt, };
net/mac80211/mlme.c +0 -5
@@ -2360,11 +2360,6 @@ void ieee80211_sta_setup_sdata(struct ie ifmgd->flags |=IEEE80211_STA_WMM_ENABLED ; hw_flags = sdata->local->hw.flags; - -if (hw_flags &IEEE80211_HW_SUPPORTS_PS ) { - ifmgd->powersave =CONFIG_MAC80211_DEFAULT_PS_VALUE ; - sdata->local->hw.conf.dynamic_ps_timeout =500 ; - } }/* configuration hooks */
drivers/net/wireless/iwmc3200wifi/cfg80211.c +22 -0
@@ -522,6 +522,27 @@ static int iwm_cfg80211_get_txpower(strureturn 0 ; } +static int iwm_cfg80211_set_power_mgmt (struct wiphy *wiphy, +struct net_device *dev, +bool enabled,int timeout) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); +u32 power_index; + +if (enabled) + power_index =IWM_POWER_INDEX_DEFAULT ; +else + power_index =IWM_POWER_INDEX_MIN ; + +if (power_index == iwm->conf.power_index) +return 0 ; + + iwm->conf.power_index = power_index; + +return iwm_umac_set_config_fix (iwm,UMAC_PARAM_TBL_CFG_FIX , +CFG_POWER_INDEX , iwm->conf.power_index); +} +static struct cfg80211_ops iwm_cfg80211_ops = { .change_virtual_intf = iwm_cfg80211_change_iface, .add_key = iwm_cfg80211_add_key,
@@ -534,6 +555,7 @@ static struct cfg80211_ops iwm_cfg80211_ .leave_ibss = iwm_cfg80211_leave_ibss, .set_tx_power = iwm_cfg80211_set_txpower, .get_tx_power = iwm_cfg80211_get_txpower, + .set_power_mgmt = iwm_cfg80211_set_power_mgmt, };struct wireless_dev *iwm_wdev_alloc (int sizeof_bus,struct device *dev)
drivers/net/wireless/iwmc3200wifi/wext.c +2 -45
59 lines not on this page · raw message
Johannes Berg
maintainerPATCH v4 17/20 cfg80211: implement IWAP for WDS
In reply to Johannes BergThis implements siocsiwap/giwap for WDS mode.
--- include/net/cfg80211.h | 10 +++++++++ net/mac80211/cfg.c | 11 ++++++++++ net/mac80211/wext.c | 26 +++---------------------- net/wireless/wext-compat.c | 46 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 71 insertions(+), 22 deletions(-)
include/net/cfg80211.h +10 -0
@@ -1018,6 +1018,9 @@ struct cfg80211_ops { enum tx_power_setting type, int dbm);int (*get_tx_power)(struct wiphy *wiphy,int *dbm); +int (*set_wds_peer)(struct wiphy *wiphy,struct net_device *dev, +u8 *addr); +void (*rfkill_poll)(struct wiphy *wiphy);#ifdef CONFIG_NL80211_TESTMODE
@@ -1619,6 +1622,13 @@ int cfg80211_wext_giwpower(struct net_destruct iw_request_info *info, struct iw_param *wrq, char *extra); +int cfg80211_wds_wext_siwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *addr,char *extra); +int cfg80211_wds_wext_giwap (struct net_device *dev, +struct iw_request_info *info, +struct sockaddr *addr,char *extra); +/* * callbacks for asynchronous cfg80211 methods, notification * functions and BSS handling helpers
net/mac80211/wext.c +4 -22
@@ -140,23 +140,8 @@ static int ieee80211_ioctl_siwap(structif (sdata->vif.type ==NL80211_IFTYPE_STATION )return cfg80211_mgd_wext_siwap (dev, info, ap_addr, extra); -if (sdata->vif.type ==NL80211_IFTYPE_WDS ) { -/* -* If it is necessary to update the WDS peer address -* while the interface is running, then we need to do -* more work here, namely if it is running we need to -* add a new and remove the old STA entry, this is -* normally handled by _open() and _stop(). -*/ -if (netif_running (dev)) -return -EBUSY ; - -memcpy (&sdata->u.wds.remote_addr, (u8 *) &ap_addr->sa_data, -ETH_ALEN ); - -return 0 ; - } - +if (sdata->vif.type ==NL80211_IFTYPE_WDS ) +return cfg80211_wds_wext_siwap (dev, info, ap_addr, extra);return -EOPNOTSUPP ; }
@@ -173,11 +158,8 @@ static int ieee80211_ioctl_giwap(structif (sdata->vif.type ==NL80211_IFTYPE_STATION )return cfg80211_mgd_wext_giwap (dev, info, ap_addr, extra); -if (sdata->vif.type ==NL80211_IFTYPE_WDS ) { - ap_addr->sa_family =ARPHRD_ETHER ; -memcpy (&ap_addr->sa_data, sdata->u.wds.remote_addr,ETH_ALEN ); -return 0 ; - } +if (sdata->vif.type ==NL80211_IFTYPE_WDS ) +return cfg80211_wds_wext_giwap (dev, info, ap_addr, extra);return -EOPNOTSUPP ; }
net/wireless/wext-compat.c +46 -0
49 lines not on this page · raw message
net/mac80211/cfg.c +11 -0
@@ -1369,6 +1369,16 @@ static int ieee80211_get_tx_power(structreturn 0 ; } +static int ieee80211_set_wds_peer (struct wiphy *wiphy,struct net_device *dev, +u8 *addr) +{ +struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); + +memcpy (&sdata->u.wds.remote_addr, addr,ETH_ALEN ); + +return 0 ; +} +static void ieee80211_rfkill_poll (struct wiphy *wiphy) {struct ieee80211_local *local =wiphy_priv (wiphy);
@@ -1454,6 +1464,7 @@ struct cfg80211_ops mac80211_config_ops .set_wiphy_params = ieee80211_set_wiphy_params, .set_tx_power = ieee80211_set_tx_power, .get_tx_power = ieee80211_get_tx_power, + .set_wds_peer = ieee80211_set_wds_peer, .rfkill_poll = ieee80211_rfkill_poll,CFG80211_TESTMODE_CMD (ieee80211_testmode_cmd) .set_power_mgmt = ieee80211_set_power_mgmt,
Johannes Berg
maintainerPATCH v4 18/20 cfg80211: implement IWRATE
In reply to Johannes BergFor now, let's implement that using a very hackish way:
simply mirror the wext API in the cfg80211 API. This will have to be changed later when we implement proper bitrate API.
--- include/net/cfg80211.h | 32 ++++++++++++++++++ net/mac80211/cfg.c | 43 +++++++++++++++++++++++++ net/mac80211/wext.c | 76 +-------------------------------------------- net/wireless/wext-compat.c | 63 +++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 74 deletions(-)
include/net/cfg80211.h +32 -0
@@ -815,6 +815,26 @@ enum tx_power_setting { TX_POWER_FIXED, }; +/* +* cfg80211_bitrate_mask - masks for bitrate control +*/ +struct cfg80211_bitrate_mask { +/* +* As discussed in Berlin, this struct really +* should look like this: + +struct { +u32 legacy; +u8 mcs[IEEE80211_HT_MCS_MASK_LEN]; +} control[IEEE80211_NUM_BANDS]; + +* Since we can always fix in-kernel users, let's keep +* it simpler for now: +*/ +u32 fixed;/* fixed bitrate, 0 == not fixed */ +u32 maxrate;/* in kbps, 0 == no limit */ +}; +/** * struct cfg80211_ops - backend description for wireless configuration *
@@ -1027,6 +1047,11 @@ struct cfg80211_ops {int (*testmode_cmd)(struct wiphy *wiphy,void *data,int len);#endif +int (*set_bitrate_mask)(struct wiphy *wiphy, +struct net_device *dev, +const u8 *peer, +const struct cfg80211_bitrate_mask *mask); +/* some temporary stuff to finish wext */ int (*set_power_mgmt)(struct wiphy *wiphy,struct net_device *dev,bool enabled,int timeout);
@@ -1581,6 +1606,13 @@ int cfg80211_wext_giwauth(struct net_devstruct ieee80211_channel *cfg80211_wext_freq (struct wiphy *wiphy,struct iw_freq *freq); +int cfg80211_wext_siwrate (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *rate,char *extra); +int cfg80211_wext_giwrate (struct net_device *dev, +struct iw_request_info *info, +struct iw_param *rate,char *extra); +int cfg80211_wext_siwrts (struct net_device *dev,struct iw_request_info *info,struct iw_param *rts,char *extra);
net/mac80211/cfg.c +43 -0
53 lines not on this page · raw message
net/mac80211/wext.c +2 -74
88 lines not on this page · raw message
net/wireless/wext-compat.c +63 -0
66 lines not on this page · raw message
Johannes Berg
maintainerPATCH v4 19/20 cfg80211: implement get_wireless_stats
In reply to Johannes BergBy dropping the noise reporting, we can implement wireless stats in cfg80211. We also make the handler return NULL if we have no information, which is possible thanks to the recent wext change.
--- include/net/cfg80211.h | 1 net/mac80211/wext.c | 69 --------------------------------------------- net/wireless/wext-compat.c | 59 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 68 deletions(-)
net/mac80211/wext.c +1 -68
@@ -165,73 +165,6 @@ static int ieee80211_ioctl_giwap(struct } -/* Get wireless statistics. Called by /proc/net/wireless and by SIOCGIWSTATS */ -static struct iw_statistics *ieee80211_get_wireless_stats (struct net_device *dev) -{ -struct ieee80211_local *local =wdev_priv (dev->ieee80211_ptr); -struct iw_statistics *wstats = &local->wstats; -struct ieee80211_sub_if_data *sdata =IEEE80211_DEV_TO_SUB_IF (dev); -struct sta_info *sta =NULL ; - -rcu_read_lock (); - -if (sdata->vif.type ==NL80211_IFTYPE_STATION ) - sta =sta_info_get (local, sdata->u.mgd.bssid); - -if (!sta) { - wstats->discard.fragment =0 ; - wstats->discard.misc =0 ; - wstats->qual.qual =0 ; - wstats->qual.level =0 ; - wstats->qual.noise =0 ; - wstats->qual.updated =IW_QUAL_ALL_INVALID ; - }else { - wstats->qual.updated =0 ; -/* -* mirror what cfg80211 does for iwrange/scan results, -* otherwise userspace gets confused. -*/ -if (local->hw.flags & (IEEE80211_HW_SIGNAL_UNSPEC | -IEEE80211_HW_SIGNAL_DBM )) { - wstats->qual.updated |=IW_QUAL_LEVEL_UPDATED ; - wstats->qual.updated |=IW_QUAL_QUAL_UPDATED ; - }else { - wstats->qual.updated |=IW_QUAL_LEVEL_INVALID ; - wstats->qual.updated |=IW_QUAL_QUAL_INVALID ; - } - -if (local->hw.flags &IEEE80211_HW_SIGNAL_UNSPEC ) { - wstats->qual.level = sta->last_signal; - wstats->qual.qual = sta->last_signal; - }else if (local->hw.flags &IEEE80211_HW_SIGNAL_DBM ) { -int sig = sta->last_signal; - - wstats->qual.updated |=IW_QUAL_DBM ; - wstats->qual.level = sig; -if (sig <-110 ) - sig =-110 ; -else if (sig >-40 ) - sig =-40 ; - wstats->qual.qual = sig +110 ; - } - -if (local->hw.flags &IEEE80211_HW_NOISE_DBM ) { -/* -* This assumes that if driver reports noise, it also -* reports signal in dBm. -*/ - wstats->qual.noise = sta->last_noise; - wstats->qual.updated |=IW_QUAL_NOISE_UPDATED ; - }else { - wstats->qual.updated |=IW_QUAL_NOISE_INVALID ; - } - } - -rcu_read_unlock (); - -return wstats; -} -/* Structures to export the Wireless Handlers */ static const iw_handler ieee80211_handler[] =
@@ -298,5 +231,5 @@ const struct iw_handler_def ieee80211_iw { .num_standard = ARRAY_SIZE(ieee80211_handler), .standard = (iw_handler *) ieee80211_handler, - .get_wireless_stats = ieee80211_get_wireless_stats, + .get_wireless_stats = cfg80211_wireless_stats, };
net/wireless/wext-compat.c +59 -0
62 lines not on this page · raw message
include/net/cfg80211.h +1 -0
@@ -1646,6 +1646,7 @@ int cfg80211_wext_siwtxpower(struct net_int cfg80211_wext_giwtxpower (struct net_device *dev,struct iw_request_info *info,union iwreq_data *data,char *keybuf); +struct iw_statistics *cfg80211_wireless_stats (struct net_device *dev); int cfg80211_wext_siwpower(struct net_device *dev, struct iw_request_info *info,
Johannes Berg
maintainerPATCH v4 20/20 mac80211: re-add HT disabling
In reply to Johannes BergThe IEEE80211_STA_TKIP_WEP_USED flag is used internally to disable HT when WEP or TKIP are used. Now that cfg80211 is giving us the required information, we can set the flag appropriately again.
--- net/mac80211/cfg.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)
net/mac80211/cfg.c +9 -1
@@ -1228,7 +1228,7 @@ static int ieee80211_assoc(struct wiphy struct cfg80211_assoc_request *req) {struct ieee80211_sub_if_data *sdata; -int ret; +int ret, i; sdata =IEEE80211_DEV_TO_SUB_IF (dev);
@@ -1236,6 +1236,14 @@ static int ieee80211_assoc(struct wiphy !(sdata->u.mgd.flags & IEEE80211_STA_AUTHENTICATED))return -ENOLINK ;/* not authenticated */ + sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED ; + +for (i =0 ; i < req->crypto.n_ciphers_pairwise; i++) +if (req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_WEP40 || + req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_TKIP || + req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_WEP104 ) + sdata->u.mgd.flags |=IEEE80211_STA_TKIP_WEP_USED ; + sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL ; sdata->u.mgd.flags |=IEEE80211_STA_BSSID_SET ;
Johannes Berg
maintainer[PATCH 21/20 v4] mac80211: remove auth algorithm retry
In reply to Johannes BergThe automatic auth algorithm issue is now solved in cfg80211, so mac80211 no longer needs code to try different algorithms -- just using whatever cfg80211 asked for is good.
--- net/mac80211/cfg.c | 8 +++---- net/mac80211/debugfs_netdev.c | 3 -- net/mac80211/ieee80211_i.h | 8 ------- net/mac80211/mlme.c | 47 ------------------------------------------ 4 files changed, 4 insertions(+), 62 deletions(-)
net/mac80211/ieee80211_i.h +0 -8
@@ -251,12 +251,6 @@ struct mesh_preq_queue {#define IEEE80211_STA_REQ_AUTH 1#define IEEE80211_STA_REQ_RUN 2 -/* bitfield of allowed auth algs */ -#define IEEE80211_AUTH_ALG_OPEN BIT(0) -#define IEEE80211_AUTH_ALG_SHARED_KEY BIT(1) -#define IEEE80211_AUTH_ALG_LEAP BIT(2) -#define IEEE80211_AUTH_ALG_FT BIT(3) -struct ieee80211_if_managed {struct timer_list timer;struct timer_list chswitch_timer;
@@ -303,7 +297,6 @@ struct ieee80211_if_managed {unsigned int flags; -unsigned int auth_algs;/* bitfield of allowed auth algs */ int auth_alg;/* currently used IEEE 802.11 authentication algorithm */ int auth_transaction;
@@ -488,7 +481,6 @@ struct ieee80211_sub_if_data {struct dentry *extra_ie_len;struct dentry *auth_tries;struct dentry *assoc_tries; -struct dentry *auth_algs;struct dentry *auth_alg;struct dentry *auth_transaction;struct dentry *flags;
net/mac80211/mlme.c +0 -47
65 lines not on this page · raw message
net/mac80211/cfg.c +4 -4
@@ -1178,16 +1178,16 @@ static int ieee80211_auth(struct wiphy *switch (req->auth_type) {case NL80211_AUTHTYPE_OPEN_SYSTEM : - sdata->u.mgd.auth_algs =IEEE80211_AUTH_ALG_OPEN ; + sdata->u.mgd.auth_alg =WLAN_AUTH_OPEN ;break ;case NL80211_AUTHTYPE_SHARED_KEY : - sdata->u.mgd.auth_algs =IEEE80211_AUTH_ALG_SHARED_KEY ; + sdata->u.mgd.auth_alg =WLAN_AUTH_SHARED_KEY ;break ;case NL80211_AUTHTYPE_FT : - sdata->u.mgd.auth_algs =IEEE80211_AUTH_ALG_FT ; + sdata->u.mgd.auth_alg =WLAN_AUTH_FT ;break ;case NL80211_AUTHTYPE_NETWORK_EAP : - sdata->u.mgd.auth_algs =IEEE80211_AUTH_ALG_LEAP ; + sdata->u.mgd.auth_alg =WLAN_AUTH_LEAP ;break ;default :return -EOPNOTSUPP ;
net/mac80211/debugfs_netdev.c +0 -3
@@ -105,7 +105,6 @@ IEEE80211_IF_FILE(capab, u.mgd.capab, HEIEEE80211_IF_FILE (extra_ie_len, u.mgd.extra_ie_len,SIZE );IEEE80211_IF_FILE (auth_tries, u.mgd.auth_tries,DEC );IEEE80211_IF_FILE (assoc_tries, u.mgd.assoc_tries,DEC ); -IEEE80211_IF_FILE (auth_algs, u.mgd.auth_algs,HEX );IEEE80211_IF_FILE (auth_alg, u.mgd.auth_alg,DEC );IEEE80211_IF_FILE (auth_transaction, u.mgd.auth_transaction,DEC );
@@ -194,7 +193,6 @@ static void add_sta_files(struct ieee802DEBUGFS_ADD (extra_ie_len, sta);DEBUGFS_ADD (auth_tries, sta);DEBUGFS_ADD (assoc_tries, sta); -DEBUGFS_ADD (auth_algs, sta);DEBUGFS_ADD (auth_alg, sta);DEBUGFS_ADD (auth_transaction, sta);DEBUGFS_ADD (flags, sta);
@@ -327,7 +325,6 @@ static void del_sta_files(struct ieee802DEBUGFS_DEL (extra_ie_len, sta);DEBUGFS_DEL (auth_tries, sta);DEBUGFS_DEL (assoc_tries, sta); -DEBUGFS_DEL (auth_algs, sta);DEBUGFS_DEL (auth_alg, sta);DEBUGFS_DEL (auth_transaction, sta);DEBUGFS_DEL (flags, sta);
Johannes Berg
maintainer[PATCH 22/20 v4] mac80211: remove dead code, clean up
In reply to Johannes BergWith mac80211 now always controlled by an external SME, a lot of code is dead -- SSID, BSSID, channel selection is always done externally, etc. Additionally, rename IEEE80211_STA_TKIP_WEP_USED to IEEE80211_STA_DISABLE_11N and clean up the code a bit.
--- net/mac80211/cfg.c | 39 ++----- net/mac80211/debugfs_netdev.c | 4 net/mac80211/ieee80211_i.h | 42 +++---- net/mac80211/iface.c | 2 net/mac80211/mlme.c | 231 ++++-------------------------------------- 5 files changed, 54 insertions(+), 264 deletions(-)
net/mac80211/cfg.c +14 -25
@@ -1194,18 +1194,14 @@ static int ieee80211_auth(struct wiphy * }memcpy (sdata->u.mgd.bssid, req->peer_addr,ETH_ALEN ); - sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL ; - sdata->u.mgd.flags |=IEEE80211_STA_BSSID_SET ; -/* TODO: req->chan */ - sdata->u.mgd.flags |=IEEE80211_STA_AUTO_CHANNEL_SEL ; + sdata->local->oper_channel = req->chan; +ieee80211_hw_config (sdata->local,0 ); -if (req->ssid) { - sdata->u.mgd.flags |=IEEE80211_STA_SSID_SET ; -memcpy (sdata->u.mgd.ssid, req->ssid, req->ssid_len); - sdata->u.mgd.ssid_len = req->ssid_len; - sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL ; - } +if (!req->ssid) +return -EINVAL ; +memcpy (sdata->u.mgd.ssid, req->ssid, req->ssid_len); + sdata->u.mgd.ssid_len = req->ssid_len;kfree (sdata->u.mgd.sme_auth_ie); sdata->u.mgd.sme_auth_ie =NULL ;
@@ -1218,7 +1214,6 @@ static int ieee80211_auth(struct wiphy * sdata->u.mgd.sme_auth_ie_len = req->ie_len; } - sdata->u.mgd.flags |=IEEE80211_STA_EXT_SME ; sdata->u.mgd.state =IEEE80211_STA_MLME_DIRECT_PROBE ;ieee80211_sta_req_auth (sdata);return 0 ;
@@ -1236,27 +1231,22 @@ static int ieee80211_assoc(struct wiphy !(sdata->u.mgd.flags & IEEE80211_STA_AUTHENTICATED))return -ENOLINK ;/* not authenticated */ - sdata->u.mgd.flags &= ~IEEE80211_STA_TKIP_WEP_USED ; + sdata->u.mgd.flags &= ~IEEE80211_STA_DISABLE_11N ;for (i =0 ; i < req->crypto.n_ciphers_pairwise; i++)if (req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_WEP40 || req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_TKIP || req->crypto.ciphers_pairwise[i] ==WLAN_CIPHER_SUITE_WEP104 ) - sdata->u.mgd.flags |=IEEE80211_STA_TKIP_WEP_USED ; + sdata->u.mgd.flags |=IEEE80211_STA_DISABLE_11N ; - sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_BSSID_SEL ; - sdata->u.mgd.flags |=IEEE80211_STA_BSSID_SET ; + sdata->local->oper_channel = req->chan; +ieee80211_hw_config (sdata->local,0 ); -/* TODO: req->chan */ - sdata->u.mgd.flags |=IEEE80211_STA_AUTO_CHANNEL_SEL ; +if (!req->ssid) +return -EINVAL ; -if (req->ssid) { - sdata->u.mgd.flags |=IEEE80211_STA_SSID_SET ; -memcpy (sdata->u.mgd.ssid, req->ssid, req->ssid_len); - sdata->u.mgd.ssid_len = req->ssid_len; - sdata->u.mgd.flags &= ~IEEE80211_STA_AUTO_SSID_SEL ; - }else - sdata->u.mgd.flags |=IEEE80211_STA_AUTO_SSID_SEL ; +memcpy (sdata->u.mgd.ssid, req->ssid, req->ssid_len); + sdata->u.mgd.ssid_len = req->ssid_len; ret =ieee80211_sta_set_extra_ie (sdata, req->ie, req->ie_len);if (ret && ret != -EALREADY )
@@ -1275,7 +1265,6 @@ static int ieee80211_assoc(struct wiphyelse sdata->u.mgd.flags &= ~IEEE80211_STA_CONTROL_PORT ; - sdata->u.mgd.flags |=IEEE80211_STA_EXT_SME ; sdata->u.mgd.state =IEEE80211_STA_MLME_ASSOCIATE ;ieee80211_sta_req_auth (sdata);return 0 ;
net/mac80211/ieee80211_i.h +17 -25
55 lines not on this page · raw message
net/mac80211/mlme.c +22 -209
338 lines not on this page · raw message
net/mac80211/debugfs_netdev.c +1 -3
@@ -111,9 +111,7 @@ IEEE80211_IF_FILE(auth_transaction, u.mgstatic ssize_t ieee80211_if_fmt_flags (const struct ieee80211_sub_if_data *sdata,char *buf,int buflen) { - return scnprintf(buf, buflen, "%s%s%s%s%s%s%s\n", - sdata->u.mgd.flags & IEEE80211_STA_SSID_SET ? "SSID\n" : "", - sdata->u.mgd.flags & IEEE80211_STA_BSSID_SET ? "BSSID\n" : "", + return scnprintf(buf, buflen, "%s%s%s%s%s\n", sdata->u.mgd.flags & IEEE80211_STA_PREV_BSSID_SET ? "prev BSSID\n" : "", sdata->u.mgd.flags & IEEE80211_STA_AUTHENTICATED ? "AUTH\n" : "", sdata->u.mgd.flags & IEEE80211_STA_ASSOCIATED ? "ASSOC\n" : "",
net/mac80211/iface.c +0 -2
@@ -485,8 +485,6 @@ static int ieee80211_stop(struct net_devsynchronize_rcu ();skb_queue_purge (&sdata->u.mgd.skb_queue); - sdata->u.mgd.flags &= ~(IEEE80211_STA_PRIVACY_INVOKED | -IEEE80211_STA_TKIP_WEP_USED );kfree (sdata->u.mgd.extra_ie); sdata->u.mgd.extra_ie =NULL ; sdata->u.mgd.extra_ie_len =0 ;
Johannes Berg
maintainerPATCH v4 14/20 cfg80211: emulate connect with auth/assoc
In reply to Johannes BergThis adds code to cfg80211 so that drivers (mac80211 right now) that don't implement connect but rather auth/assoc can still be used with the nl80211 connect command. This will also be necessary for the wext compat code.
---
v4: dynamically allocate conn data
v4.1: fix warnings with userspace SME
include/net/cfg80211.h | 6 net/wireless/core.c | 7 net/wireless/core.h | 8 net/wireless/mlme.c | 81 +++++++--- net/wireless/nl80211.c | 4 net/wireless/scan.c | 7 net/wireless/sme.c | 395 +++++++++++++++++++++++++++++++++++++++++++++++-- 7 files changed, 475 insertions(+), 33 deletions(-)
net/wireless/core.h +8 -0
@@ -62,6 +62,8 @@ struct cfg80211_registered_device {struct genl_info *testmode_info;#endif +struct work_struct conn_work; +#ifdef CONFIG_CFG80211_DEBUGFS /* Debugfs entries */ struct wiphy_debugfsdentries {
@@ -181,8 +183,14 @@ int cfg80211_connect(struct cfg80211_regint cfg80211_disconnect (struct cfg80211_registered_device *rdev,struct net_device *dev,u16 reason); +void cfg80211_conn_work (struct work_struct *work); +/* internal helpers */ int cfg80211_validate_key_settings (struct key_params *params,int key_idx,const u8 *mac_addr); +void __cfg80211_disconnected (struct net_device *dev,gfp_t gfp,u8 *ie, +size_t ie_len,u16 reason,bool from_ap); +void cfg80211_sme_scan_done (struct net_device *dev); +void cfg80211_sme_rx_auth (struct net_device *dev,const u8 *buf,size_t len);#endif /* __NET_WIRELESS_CORE_H */
net/wireless/nl80211.c +2 -2
@@ -351,12 +351,12 @@ static int nl80211_send_wiphy(struct sk_#undef CMD -if (dev->ops->connect) { +if (dev->ops->connect || dev->ops->auth) { i++;NLA_PUT_U32 (msg, i,NL80211_CMD_CONNECT ); } -if (dev->ops->disconnect) { +if (dev->ops->disconnect || dev->ops->deauth) { i++;NLA_PUT_U32 (msg, i,NL80211_CMD_DISCONNECT ); }
net/wireless/sme.c +382 -13
465 lines not on this page · raw message
net/wireless/mlme.c +64 -17
122 lines not on this page · raw message
net/wireless/core.c +7 -0
@@ -321,6 +321,7 @@ struct wiphy *wiphy_new(const struct cfg }INIT_WORK (&drv->rfkill_sync, cfg80211_rfkill_sync_work); +INIT_WORK (&drv->conn_work, cfg80211_conn_work);/* * Initialize wiphy parameters to IEEE 802.11 MIB default values.
@@ -481,6 +482,8 @@ void wiphy_unregister(struct wiphy *wiph/* unlock again before freeing */ mutex_unlock (&drv->mtx); +cancel_work_sync (&drv->conn_work); +cfg80211_debugfs_drv_del (drv);/* If this device got a regulatory hint tell core its
@@ -569,6 +572,10 @@ static int cfg80211_netdev_notifier_callbreak ; }break ; +case NETDEV_DOWN : +kfree (wdev->conn); + wdev->conn =NULL ; +break ;case NETDEV_UP :#ifdef CONFIG_WIRELESS_EXT if (wdev->iftype !=NL80211_IFTYPE_ADHOC )
include/net/cfg80211.h +5 -1
@@ -1209,6 +1209,9 @@ extern void wiphy_unregister(struct wiph*/ extern void wiphy_free (struct wiphy *wiphy); +/* internal struct */ +struct cfg80211_conn ; +/** * struct wireless_dev - wireless per-netdev state *
@@ -1242,9 +1245,10 @@ struct wireless_dev {u8 ssid_len;enum {CFG80211_SME_IDLE , -CFG80211_SME_CONNECTING ,/* ->connect called */ +CFG80211_SME_CONNECTING ,CFG80211_SME_CONNECTED , } sme_state; +struct cfg80211_conn *conn;#ifdef CONFIG_WIRELESS_EXT /* wext data */
net/wireless/scan.c +7 -0
@@ -30,6 +30,13 @@ void cfg80211_scan_done(struct cfg80211_WARN_ON (request !=wiphy_to_dev (request->wiphy)->scan_req); +/* +* This must be before sending the other events! +* Otherwise, wpa_supplicant gets completely confused with +* wext events. +*/ +cfg80211_sme_scan_done (dev); +if (aborted)nl80211_send_scan_aborted (wiphy_to_dev (request->wiphy), dev);else
Johannes Berg
maintainerPATCH 1/1 cfg80211: send events for userspace SME
In reply to Johannes BergWhen the userspace SME is in control, we are currently not sending events, but this means that any userspace applications using wext or nl80211 to receive events will not know what's going on unless they can also interpret the nl80211 assoc event. Since we have all the required code, let the SME follow events from the userspace SME, this even means that you will be refused to connect() while the userspace SME is in control and connected.
--- net/wireless/sme.c | 64 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 38 insertions(+), 26 deletions(-)
net/wireless/sme.c +38 -26
@@ -287,6 +287,44 @@ static void __cfg80211_connect_result(stif (WARN_ON (wdev->iftype !=NL80211_IFTYPE_STATION ))return ; +if (wdev->sme_state ==CFG80211_SME_CONNECTED ) +nl80211_send_roamed (wiphy_to_dev (wdev->wiphy), dev, + bssid, req_ie, req_ie_len, + resp_ie, resp_ie_len, gfp); +else +nl80211_send_connect_result (wiphy_to_dev (wdev->wiphy), dev, + bssid, req_ie, req_ie_len, + resp_ie, resp_ie_len, + status, gfp); + +#ifdef CONFIG_WIRELESS_EXT +if (wextev) { +if (req_ie && status ==WLAN_STATUS_SUCCESS ) { +memset (&wrqu,0 ,sizeof (wrqu)); + wrqu.data.length = req_ie_len; +wireless_send_event (dev,IWEVASSOCRESPIE , &wrqu, req_ie); + } + +if (resp_ie && status ==WLAN_STATUS_SUCCESS ) { +memset (&wrqu,0 ,sizeof (wrqu)); + wrqu.data.length = resp_ie_len; +wireless_send_event (dev,IWEVASSOCRESPIE , &wrqu, resp_ie); + } + +memset (&wrqu,0 ,sizeof (wrqu)); + wrqu.ap_addr.sa_family =ARPHRD_ETHER ; +if (bssid && status ==WLAN_STATUS_SUCCESS ) +memcpy (wrqu.ap_addr.sa_data, bssid,ETH_ALEN ); +wireless_send_event (dev,SIOCGIWAP , &wrqu,NULL ); + } +#endif + +if (status ==WLAN_STATUS_SUCCESS && + wdev->sme_state ==CFG80211_SME_IDLE ) { + wdev->sme_state =CFG80211_SME_CONNECTED ; +return ; + } +if (wdev->sme_state !=CFG80211_SME_CONNECTING )return ;
@@ -315,32 +353,6 @@ static void __cfg80211_connect_result(stif (wdev->conn) wdev->conn->state =CFG80211_CONN_IDLE ; - -nl80211_send_connect_result (wiphy_to_dev (wdev->wiphy), dev, bssid, - req_ie, req_ie_len, resp_ie, resp_ie_len, - status, gfp); - -#ifdef CONFIG_WIRELESS_EXT -if (wextev) { -if (req_ie && status ==WLAN_STATUS_SUCCESS ) { -memset (&wrqu,0 ,sizeof (wrqu)); - wrqu.data.length = req_ie_len; -wireless_send_event (dev,IWEVASSOCRESPIE , &wrqu, req_ie); - } - -if (resp_ie && status ==WLAN_STATUS_SUCCESS ) { -memset (&wrqu,0 ,sizeof (wrqu)); - wrqu.data.length = resp_ie_len; -wireless_send_event (dev,IWEVASSOCRESPIE , &wrqu, resp_ie); - } - -memset (&wrqu,0 ,sizeof (wrqu)); - wrqu.ap_addr.sa_family =ARPHRD_ETHER ; -if (bssid && status ==WLAN_STATUS_SUCCESS ) -memcpy (wrqu.ap_addr.sa_data, bssid,ETH_ALEN ); -wireless_send_event (dev,SIOCGIWAP , &wrqu,NULL ); - } -#endif } void cfg80211_connect_result(struct net_device *dev, const u8 *bssid,
PATCH 1/1 iwmc3200wifi: cfg80211 managed mode port
In reply to Johannes BergThis patch ports iwm to the new cfg80211 managed mode API. Whenever those managed mode routines get combined with the ibss one, we will just have to entirely get rid of the wext implementation (We may have to only keep the iw_handler until cfg80211 does the wext registration for us).
--- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 195 ++++++++++++++++ drivers/net/wireless/iwmc3200wifi/rx.c | 13 - drivers/net/wireless/iwmc3200wifi/wext.c | 320 ++------------------------- 3 files changed, 239 insertions(+), 289 deletions(-)
drivers/net/wireless/iwmc3200wifi/cfg80211.c +195 -0
@@ -305,6 +305,25 @@ static int iwm_cfg80211_set_default_key(return iwm_reset_profile (iwm); } +int iwm_cfg80211_get_station (struct wiphy *wiphy,struct net_device *ndev, +u8 *mac,struct station_info *sinfo) +{ +struct iwm_priv *iwm =ndev_to_iwm (ndev); + +if (memcmp (mac, iwm->bssid,ETH_ALEN )) +return -ENOENT ; + + sinfo->filled |=STATION_INFO_TX_BITRATE ; + sinfo->txrate.legacy = iwm->rate *10 ; + +if (test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { + sinfo->filled |=STATION_INFO_SIGNAL ; + sinfo->signal = iwm->wstats.qual.level; + } + +return 0 ; +} +int iwm_cfg80211_inform_bss (struct iwm_priv *iwm) {
@@ -500,6 +519,179 @@ static int iwm_cfg80211_leave_ibss(strucreturn 0 ; } +static int iwm_set_auth_type (struct iwm_priv *iwm, +enum nl80211_auth_type sme_auth_type) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +switch (sme_auth_type) { +case NL80211_AUTHTYPE_AUTOMATIC : +case NL80211_AUTHTYPE_OPEN_SYSTEM : +IWM_DBG_WEXT (iwm,DBG ,"OPEN auth\n" ); + *auth_type =UMAC_AUTH_TYPE_OPEN ; +break ; +case NL80211_AUTHTYPE_SHARED_KEY : +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) { +IWM_DBG_WEXT (iwm,DBG ,"WPA auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; + }else { +IWM_DBG_WEXT (iwm,DBG ,"WEP shared key auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + } + +break ; +default : +IWM_ERR (iwm,"Unsupported auth alg: 0x%x\n" , sme_auth_type); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_wpa_version (struct iwm_priv *iwm,u32 wpa_version) +{ +if (!wpa_version) { + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_LEGACY_PROFILE ; +return 0 ; + } + +if (wpa_version &NL80211_WPA_VERSION_2 ) + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_RSNA_ON_MSK ; + +if (wpa_version &NL80211_WPA_VERSION_1 ) + iwm->umac_profile->sec.flags |=UMAC_SEC_FLG_WPA_ON_MSK ; + +return 0 ; +} + +static int iwm_set_cipher (struct iwm_priv *iwm,u32 cipher,bool ucast) +{ +u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher : + &iwm->umac_profile->sec.mcast_cipher; + +if (!cipher) { + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +return 0 ; + } + +switch (cipher) { +case IW_AUTH_CIPHER_NONE : + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +break ; +case WLAN_CIPHER_SUITE_WEP40 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_40 ; +break ; +case WLAN_CIPHER_SUITE_WEP104 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_104 ; +break ; +case WLAN_CIPHER_SUITE_TKIP : + *profile_cipher =UMAC_CIPHER_TYPE_TKIP ; +break ; +case WLAN_CIPHER_SUITE_CCMP : + *profile_cipher =UMAC_CIPHER_TYPE_CCMP ; +break ; +default : +IWM_ERR (iwm,"Unsupported cipher: 0x%x\n" , cipher); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_key_mgt (struct iwm_priv *iwm,u32 key_mgt) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +IWM_DBG_WEXT (iwm,DBG ,"key_mgt: 0x%x\n" , key_mgt); + +if (key_mgt ==WLAN_AKM_SUITE_8021X ) + *auth_type =UMAC_AUTH_TYPE_8021X ; +else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; +else + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + }else { +IWM_ERR (iwm,"Invalid key mgt: 0x%x\n" , key_mgt); +return -EINVAL ; + } + +return 0 ; +} + + +static int iwm_cfg80211_connect (struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_connect_params *sme) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); +struct ieee80211_channel *chan = sme->channel; +int ret; + +if (!test_bit (IWM_STATUS_READY , &iwm->status)) +return -EIO ; + +if (!sme->ssid) +return -EINVAL ; + +if (chan) + iwm->channel = +ieee80211_frequency_to_channel (chan->center_freq); + + iwm->umac_profile->ssid.ssid_len = sme->ssid_len; +memcpy (iwm->umac_profile->ssid.ssid, sme->ssid, sme->ssid_len); + +if (sme->bssid) { +IWM_DBG_WEXT (iwm,DBG ,"BSSID: %pM\n" , sme->bssid); +memcpy (&iwm->umac_profile->bssid[0 ], sme->bssid,ETH_ALEN ); + iwm->umac_profile->bss_num =1 ; + }else { +memset (&iwm->umac_profile->bssid[0 ],0 ,ETH_ALEN ); + iwm->umac_profile->bss_num =0 ; + } + + ret =iwm_set_auth_type (iwm, sme->auth_type); +if (ret <0 ) +return ret; + + ret =iwm_set_wpa_version (iwm, sme->crypto.wpa_versions); +if (ret <0 ) +return ret; + +if (sme->crypto.n_ciphers_pairwise) { + ret =iwm_set_cipher (iwm, sme->crypto.ciphers_pairwise[0 ], + true); +if (ret <0 ) +return ret; + } + + ret =iwm_set_cipher (iwm, sme->crypto.cipher_group, false); +if (ret <0 ) +return ret; + +if (sme->crypto.n_akm_suites) { + ret =iwm_set_key_mgt (iwm, sme->crypto.akm_suites[0 ]); +if (ret <0 ) +return ret; + } + +return iwm_send_mlme_profile (iwm); +} + +static int iwm_cfg80211_disconnect (struct wiphy *wiphy,struct net_device *dev, +u16 reason_code) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); + +IWM_DBG_WEXT (iwm,DBG ,"Active: %d\n" , iwm->umac_profile_active); + +if (iwm->umac_profile_active) +return iwm_invalidate_mlme_profile (iwm); + +return 0 ; +} +static int iwm_cfg80211_set_txpower (struct wiphy *wiphy,enum tx_power_setting type,int dbm) {
@@ -549,8 +741,11 @@ static struct cfg80211_ops iwm_cfg80211_ .get_key = iwm_cfg80211_get_key, .del_key = iwm_cfg80211_del_key, .set_default_key = iwm_cfg80211_set_default_key, + .get_station = iwm_cfg80211_get_station, .scan = iwm_cfg80211_scan, .set_wiphy_params = iwm_cfg80211_set_wiphy_params, + .connect = iwm_cfg80211_connect, + .disconnect = iwm_cfg80211_disconnect, .join_ibss = iwm_cfg80211_join_ibss, .leave_ibss = iwm_cfg80211_leave_ibss, .set_tx_power = iwm_cfg80211_set_txpower,
drivers/net/wireless/iwmc3200wifi/wext.c +35 -285
399 lines not on this page · raw message
drivers/net/wireless/iwmc3200wifi/rx.c +9 -4
@@ -521,7 +521,10 @@ static int iwm_mlme_assoc_complete(struciwm_link_on (iwm); -memcpy (wrqu.ap_addr.sa_data, complete->bssid,ETH_ALEN ); +cfg80211_connect_result (iwm_to_ndev (iwm), + complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_SUCCESS ,GFP_KERNEL );break ;case UMAC_ASSOC_COMPLETE_FAILURE :clear_bit (IWM_STATUS_ASSOCIATED , &iwm->status);
@@ -529,6 +532,11 @@ static int iwm_mlme_assoc_complete(struc iwm->channel =0 ;iwm_link_off (iwm); + +cfg80211_connect_result (iwm_to_ndev (iwm), complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_UNSPECIFIED_FAILURE , +GFP_KERNEL );default :break ; }
@@ -538,9 +546,6 @@ static int iwm_mlme_assoc_complete(strucreturn 0 ; } - wrqu.ap_addr.sa_family =ARPHRD_ETHER ; -wireless_send_event (iwm_to_ndev (iwm),SIOCGIWAP , &wrqu,NULL ); -return 0 ; }
Signature · 13 lines
Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
PATCH 1/1 cfg80211: check for current_bss from giwrate
In reply to Johannes BergWhen connecting to an ESSID manually, we may not set the BSSID, and thus wdev->wext.connect.bssid will be NULL.wdev->current_bss is always updated when a connection is established so we should check it first.
--- net/wireless/wext-compat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
net/wireless/wext-compat.c +5 -2
@@ -1137,8 +1137,11 @@ int cfg80211_wext_giwrate(struct net_devif (!rdev->ops->get_station)return -EOPNOTSUPP ; - addr = wdev->wext.connect.bssid; -if (!addr) +if (wdev->current_bss) + addr = wdev->current_bss->bssid; +else if (wdev->wext.connect.bssid) + addr = wdev->wext.connect.bssid; +else return -ENOTSUPP ; err = rdev->ops->get_station (&rdev->wiphy, dev, addr, &sinfo);
Signature · 13 lines
Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Re: [PATCH] cfg80211: check for current_bss from giwrate
Quoted 4 lines · Samuel Ortiz
When connecting to an ESSID manually, we may not set the BSSID, and thus
wdev->wext.connect.bssidwill be NULL.wdev->current_bssis always updated when a connection is established so we should check it first.
Indeed, good catch
Quoted 23 lines
Signed-off-by Samuel Ortiz <[email protected]>--- net/wireless/wext-compat.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)Index:
iwm-2.6/net/wireless/wext-compat.c
===================================================================net/wireless/wext-compat.c +5
-2@@ -1137,8 +1137,11 @@ int cfg80211_wext_giwrate(struct net_devif (!rdev->ops->get_station)return -EOPNOTSUPP ; - addr = wdev->wext.connect.bssid; -if (!addr) +if (wdev->current_bss) + addr = wdev->current_bss->bssid; +else if (wdev->wext.connect.bssid) + addr = wdev->wext.connect.bssid; +else return -ENOTSUPP ; err = rdev->ops->get_station (&rdev->wiphy, dev, addr, &sinfo);
Johannes Berg
maintainerRe: [PATCH] iwmc3200wifi: cfg80211 managed mode port
In reply to Samuel OrtizQuoted 4 lines · Samuel Ortiz
This patch ports iwm to the new cfg80211 managed mode API. Whenever those managed mode routines get combined with the ibss one, we will just have to entirely get rid of the wext implementation (We may have to only keep the
iw_handleruntil cfg80211 does the wext registration for us).
Looks good. I'll take care of the combine part later.
johannes
Quoted 679 lines
Signed-off-by Samuel Ortiz <[email protected]>--- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 195 ++++++++++++++++ drivers/net/wireless/iwmc3200wifi/rx.c | 13 - drivers/net/wireless/iwmc3200wifi/wext.c | 320 ++------------------------- 3 files changed, 239 insertions(+), 289 deletions(-)Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/cfg80211.c
===================================================================drivers/net/wireless/iwmc3200wifi/cfg80211.c +195
-0@@ -305,6 +305,25 @@ static int iwm_cfg80211_set_default_key(return iwm_reset_profile (iwm); } +int iwm_cfg80211_get_station (struct wiphy *wiphy,struct net_device *ndev, +u8 *mac,struct station_info *sinfo) +{ +struct iwm_priv *iwm =ndev_to_iwm (ndev); + +if (memcmp (mac, iwm->bssid,ETH_ALEN )) +return -ENOENT ; + + sinfo->filled |=STATION_INFO_TX_BITRATE ; + sinfo->txrate.legacy = iwm->rate *10 ; + +if (test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { + sinfo->filled |=STATION_INFO_SIGNAL ; + sinfo->signal = iwm->wstats.qual.level; + } + +return 0 ; +} +int iwm_cfg80211_inform_bss (struct iwm_priv *iwm) {@@ -500,6 +519,179 @@ static int iwm_cfg80211_leave_ibss(strucreturn 0 ; } +static int iwm_set_auth_type (struct iwm_priv *iwm, +enum nl80211_auth_type sme_auth_type) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +switch (sme_auth_type) { +case NL80211_AUTHTYPE_AUTOMATIC : +case NL80211_AUTHTYPE_OPEN_SYSTEM : +IWM_DBG_WEXT (iwm,DBG ,"OPEN auth\n" ); + *auth_type =UMAC_AUTH_TYPE_OPEN ; +break ; +case NL80211_AUTHTYPE_SHARED_KEY : +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) { +IWM_DBG_WEXT (iwm,DBG ,"WPA auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; + }else { +IWM_DBG_WEXT (iwm,DBG ,"WEP shared key auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + } + +break ; +default : +IWM_ERR (iwm,"Unsupported auth alg: 0x%x\n" , sme_auth_type); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_wpa_version (struct iwm_priv *iwm,u32 wpa_version) +{ +if (!wpa_version) { + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_LEGACY_PROFILE ; +return 0 ; + } + +if (wpa_version &NL80211_WPA_VERSION_2 ) + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_RSNA_ON_MSK ; + +if (wpa_version &NL80211_WPA_VERSION_1 ) + iwm->umac_profile->sec.flags |=UMAC_SEC_FLG_WPA_ON_MSK ; + +return 0 ; +} + +static int iwm_set_cipher (struct iwm_priv *iwm,u32 cipher,bool ucast) +{ +u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher : + &iwm->umac_profile->sec.mcast_cipher; + +if (!cipher) { + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +return 0 ; + } + +switch (cipher) { +case IW_AUTH_CIPHER_NONE : + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +break ; +case WLAN_CIPHER_SUITE_WEP40 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_40 ; +break ; +case WLAN_CIPHER_SUITE_WEP104 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_104 ; +break ; +case WLAN_CIPHER_SUITE_TKIP : + *profile_cipher =UMAC_CIPHER_TYPE_TKIP ; +break ; +case WLAN_CIPHER_SUITE_CCMP : + *profile_cipher =UMAC_CIPHER_TYPE_CCMP ; +break ; +default : +IWM_ERR (iwm,"Unsupported cipher: 0x%x\n" , cipher); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_key_mgt (struct iwm_priv *iwm,u32 key_mgt) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +IWM_DBG_WEXT (iwm,DBG ,"key_mgt: 0x%x\n" , key_mgt); + +if (key_mgt ==WLAN_AKM_SUITE_8021X ) + *auth_type =UMAC_AUTH_TYPE_8021X ; +else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; +else + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + }else { +IWM_ERR (iwm,"Invalid key mgt: 0x%x\n" , key_mgt); +return -EINVAL ; + } + +return 0 ; +} + + +static int iwm_cfg80211_connect (struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_connect_params *sme) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); +struct ieee80211_channel *chan = sme->channel; +int ret; + +if (!test_bit (IWM_STATUS_READY , &iwm->status)) +return -EIO ; + +if (!sme->ssid) +return -EINVAL ; + +if (chan) + iwm->channel = +ieee80211_frequency_to_channel (chan->center_freq); + + iwm->umac_profile->ssid.ssid_len = sme->ssid_len; +memcpy (iwm->umac_profile->ssid.ssid, sme->ssid, sme->ssid_len); + +if (sme->bssid) { +IWM_DBG_WEXT (iwm,DBG ,"BSSID: %pM\n" , sme->bssid); +memcpy (&iwm->umac_profile->bssid[0 ], sme->bssid,ETH_ALEN ); + iwm->umac_profile->bss_num =1 ; + }else { +memset (&iwm->umac_profile->bssid[0 ],0 ,ETH_ALEN ); + iwm->umac_profile->bss_num =0 ; + } + + ret =iwm_set_auth_type (iwm, sme->auth_type); +if (ret <0 ) +return ret; + + ret =iwm_set_wpa_version (iwm, sme->crypto.wpa_versions); +if (ret <0 ) +return ret; + +if (sme->crypto.n_ciphers_pairwise) { + ret =iwm_set_cipher (iwm, sme->crypto.ciphers_pairwise[0 ], + true); +if (ret <0 ) +return ret; + } + + ret =iwm_set_cipher (iwm, sme->crypto.cipher_group, false); +if (ret <0 ) +return ret; + +if (sme->crypto.n_akm_suites) { + ret =iwm_set_key_mgt (iwm, sme->crypto.akm_suites[0 ]); +if (ret <0 ) +return ret; + } + +return iwm_send_mlme_profile (iwm); +} + +static int iwm_cfg80211_disconnect (struct wiphy *wiphy,struct net_device *dev, +u16 reason_code) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); + +IWM_DBG_WEXT (iwm,DBG ,"Active: %d\n" , iwm->umac_profile_active); + +if (iwm->umac_profile_active) +return iwm_invalidate_mlme_profile (iwm); + +return 0 ; +} +static int iwm_cfg80211_set_txpower (struct wiphy *wiphy,enum tx_power_setting type,int dbm) {@@ -549,8 +741,11 @@ static struct cfg80211_ops iwm_cfg80211_ .get_key = iwm_cfg80211_get_key, .del_key = iwm_cfg80211_del_key, .set_default_key = iwm_cfg80211_set_default_key, + .get_station = iwm_cfg80211_get_station, .scan = iwm_cfg80211_scan, .set_wiphy_params = iwm_cfg80211_set_wiphy_params, + .connect = iwm_cfg80211_connect, + .disconnect = iwm_cfg80211_disconnect, .join_ibss = iwm_cfg80211_join_ibss, .leave_ibss = iwm_cfg80211_leave_ibss, .set_tx_power = iwm_cfg80211_set_txpower,Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/wext.c
===================================================================drivers/net/wireless/iwmc3200wifi/wext.c +35
-285@@ -21,31 +21,11 @@* */ -#include <linux/kernel.h> -#include <linux/netdevice.h> #include <linux/wireless.h> -#include <linux/if_arp.h> -#include <linux/etherdevice.h> #include <net/cfg80211.h> -#include <net/iw_handler.h> #include "iwm.h" -#include "umac.h" #include "commands.h" -#include "debug.h" - -static struct iw_statistics *iwm_get_wireless_stats (struct net_device *dev) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); -struct iw_statistics *wstats = &iwm->wstats; - -if (!test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { -memset (wstats,0 ,sizeof (struct iw_statistics )); - wstats->qual.updated =IW_QUAL_ALL_INVALID ; - } - -return wstats; -} static int iwm_wext_siwfreq(struct net_device *dev, struct iw_request_info *info,@@ -53,14 +33,12 @@ static int iwm_wext_siwfreq(struct net_d {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (freq->flags ==IW_FREQ_AUTO ) -return 0 ; - -/* frequency/channel can only be set in IBSS mode */ -if (iwm->conf.mode !=UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS : +return cfg80211_ibss_wext_giwfreq (dev, info, freq, extra); +default :return -EOPNOTSUPP ; - -return cfg80211_ibss_wext_siwfreq (dev, info, freq, extra); + } } static int iwm_wext_giwfreq(struct net_device *dev,@@ -69,69 +47,29 @@ static int iwm_wext_giwfreq(struct net_d {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwfreq (dev, info, freq, extra); - - freq->e =0 ; - freq->m = iwm->channel; - -return 0 ; +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_giwfreq (dev, info, freq, extra); +default : +return -EOPNOTSUPP ; + } }static int iwm_wext_siwap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) {struct iwm_priv *iwm =ndev_to_iwm (dev); -int ret; - -IWM_DBG_WEXT (iwm,DBG ,"Set BSSID: %pM\n" , ap_addr->sa_data); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_siwap (dev, info, ap_addr, extra); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - -if (is_zero_ether_addr (ap_addr->sa_data) || -is_broadcast_ether_addr (ap_addr->sa_data)) { -IWM_DBG_WEXT (iwm,DBG ,"clear mandatory bssid %pM\n" , - iwm->umac_profile->bssid[0 ]); -memset (&iwm->umac_profile->bssid[0 ],0 ,ETH_ALEN ); - iwm->umac_profile->bss_num =0 ; - }else { -IWM_DBG_WEXT (iwm,DBG ,"add mandatory bssid %pM\n" , - ap_addr->sa_data); -memcpy (&iwm->umac_profile->bssid[0 ], ap_addr->sa_data, -ETH_ALEN ); - iwm->umac_profile->bss_num =1 ; - } - -if (iwm->umac_profile_active) { -int i; - -if (!memcmp (&iwm->umac_profile->bssid[0 ], iwm->bssid,ETH_ALEN )) -return 0 ; - -/* -* If we're clearing the BSSID, and we're associated, -* we have to clear the keys as they're no longer valid. -*/ -if (is_zero_ether_addr (ap_addr->sa_data)) { -for (i =0 ; i <IWM_NUM_KEYS ; i++) - iwm->keys[i].key_len =0 ; - } - - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_siwap (dev, info, ap_addr, extra); +default : +return -EOPNOTSUPP ; } - -if (iwm->umac_profile->ssid.ssid_len) -return iwm_send_mlme_profile (iwm); - -return 0 ; } static int iwm_wext_giwap(struct net_device *dev, struct iw_request_info *info,@@ -143,17 +81,10 @@ static int iwm_wext_giwap(struct net_devcase UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwap (dev, info, ap_addr, extra);case UMAC_MODE_BSS : -if (test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { - ap_addr->sa_family =ARPHRD_ETHER ; -memcpy (&ap_addr->sa_data, iwm->bssid,ETH_ALEN ); - }else -memset (&ap_addr->sa_data,0 ,ETH_ALEN ); -break ; +return cfg80211_mgd_wext_giwap (dev, info, ap_addr, extra);default :return -EOPNOTSUPP ; } - -return 0 ; } static int iwm_wext_siwessid(struct net_device *dev,@@ -161,36 +92,15 @@ static int iwm_wext_siwessid(struct net_ struct iw_point *data, char *ssid) { struct iwm_priv *iwm = ndev_to_iwm(dev); -size_t len = data->length; -int ret; - -IWM_DBG_WEXT (iwm,DBG ,"Set ESSID: >%s<\n" , ssid); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_siwessid (dev, info, data, ssid); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - -if (len >0 && ssid[len -1 ] =='\0' ) - len--; - -if (iwm->umac_profile_active) { -if (iwm->umac_profile->ssid.ssid_len == len && - !memcmp (iwm->umac_profile->ssid.ssid, ssid, len)) -return 0 ; - - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_siwessid (dev, info, data, ssid); +default : +return -EOPNOTSUPP ; } - - iwm->umac_profile->ssid.ssid_len = len; -memcpy (iwm->umac_profile->ssid.ssid, ssid, len); - -return iwm_send_mlme_profile (iwm); } static int iwm_wext_giwessid(struct net_device *dev,@@ -199,174 +109,14 @@ static int iwm_wext_giwessid(struct net_ {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwessid (dev, info, data, ssid); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - - data->length = iwm->umac_profile->ssid.ssid_len; -if (data->length) { -memcpy (ssid, iwm->umac_profile->ssid.ssid, data->length); - data->flags =1 ; - }else - data->flags =0 ; - -return 0 ; -} - -static int iwm_wext_giwrate (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *rate,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - - rate->value = iwm->rate *1000000 ; - -return 0 ; -} - -static int iwm_set_wpa_version (struct iwm_priv *iwm,u8 wpa_version) -{ -if (wpa_version &IW_AUTH_WPA_VERSION_WPA2 ) - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_RSNA_ON_MSK ; -else if (wpa_version &IW_AUTH_WPA_VERSION_WPA ) - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_WPA_ON_MSK ; -else - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_LEGACY_PROFILE ; - -return 0 ; -} - -static int iwm_set_key_mgt (struct iwm_priv *iwm,u8 key_mgt) -{ -u8 *auth_type = &iwm->umac_profile->sec.auth_type; - -IWM_DBG_WEXT (iwm,DBG ,"key_mgt: 0x%x\n" , key_mgt); - -if (key_mgt ==IW_AUTH_KEY_MGMT_802_1X ) - *auth_type =UMAC_AUTH_TYPE_8021X ; -else if (key_mgt ==IW_AUTH_KEY_MGMT_PSK ) { -if (iwm->umac_profile->sec.flags & - (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) - *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; -else - *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; - }else { -IWM_ERR (iwm,"Invalid key mgt: 0x%x\n" , key_mgt); -return -EINVAL ; - } - -return 0 ; -} - -static int iwm_set_cipher (struct iwm_priv *iwm,u8 cipher,u8 ucast) -{ -u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher : - &iwm->umac_profile->sec.mcast_cipher; - -switch (cipher) { -case IW_AUTH_CIPHER_NONE : - *profile_cipher =UMAC_CIPHER_TYPE_NONE ; -break ; -case IW_AUTH_CIPHER_WEP40 : - *profile_cipher =UMAC_CIPHER_TYPE_WEP_40 ; -break ; -case IW_AUTH_CIPHER_TKIP : - *profile_cipher =UMAC_CIPHER_TYPE_TKIP ; -break ; -case IW_AUTH_CIPHER_CCMP : - *profile_cipher =UMAC_CIPHER_TYPE_CCMP ; -break ; -case IW_AUTH_CIPHER_WEP104 : - *profile_cipher =UMAC_CIPHER_TYPE_WEP_104 ; -break ; -default : -IWM_ERR (iwm,"Unsupported cipher: 0x%x\n" , cipher); -return -ENOTSUPP ; - } - -return 0 ; -} - -static int iwm_set_auth_alg (struct iwm_priv *iwm,u8 auth_alg) -{ -u8 *auth_type = &iwm->umac_profile->sec.auth_type; - -IWM_DBG_WEXT (iwm,DBG ,"auth_alg: 0x%x\n" , auth_alg); - -switch (auth_alg) { -case IW_AUTH_ALG_OPEN_SYSTEM : - *auth_type =UMAC_AUTH_TYPE_OPEN ; -break ; -case IW_AUTH_ALG_SHARED_KEY : -if (iwm->umac_profile->sec.flags & - (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) { -if (*auth_type ==UMAC_AUTH_TYPE_8021X ) -return -EINVAL ; - *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; - }else { -IWM_DBG_WEXT (iwm,DBG ,"WEP shared key\n" ); - *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; - } -break ; -case IW_AUTH_ALG_LEAP : -default : -IWM_ERR (iwm,"Unsupported auth alg: 0x%x\n" , auth_alg); -return -ENOTSUPP ; - } - -return 0 ; -} - -static int iwm_wext_siwauth (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *data,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); -int ret; - -if ((data->flags) & - (IW_AUTH_WPA_VERSION |IW_AUTH_KEY_MGMT | -IW_AUTH_WPA_ENABLED |IW_AUTH_80211_AUTH_ALG )) { -/* We need to invalidate the current profile */ -if (iwm->umac_profile_active) { - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } - } - } - -switch (data->flags &IW_AUTH_INDEX ) { -case IW_AUTH_WPA_VERSION : -return iwm_set_wpa_version (iwm, data->value); -break ; -case IW_AUTH_CIPHER_PAIRWISE : -return iwm_set_cipher (iwm, data->value,1 ); -break ; -case IW_AUTH_CIPHER_GROUP : -return iwm_set_cipher (iwm, data->value,0 ); -break ; -case IW_AUTH_KEY_MGMT : -return iwm_set_key_mgt (iwm, data->value); -break ; -case IW_AUTH_80211_AUTH_ALG : -return iwm_set_auth_alg (iwm, data->value); -break ; +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_giwessid (dev, info, data, ssid);default : -return -ENOTSUPP ; +return -EOPNOTSUPP ; } - -return 0 ; -} - -static int iwm_wext_giwauth (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *data,char *extra) -{ -return 0 ; } static const iw_handler iwm_handlers[] =@@ -404,7 +154,7 @@ static const iw_handler iwm_handlers[] = (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* SIOCSIWRATE */ - (iw_handler ) iwm_wext_giwrate,/* SIOCGIWRATE */ + (iw_handler ) cfg80211_wext_giwrate,/* SIOCGIWRATE */ (iw_handler ) cfg80211_wext_siwrts,/* SIOCSIWRTS */ (iw_handler ) cfg80211_wext_giwrts,/* SIOCGIWRTS */ (iw_handler) cfg80211_wext_siwfrag, /* SIOCSIWFRAG */@@ -419,10 +169,10 @@ static const iw_handler iwm_handlers[] = (iw_handler ) cfg80211_wext_giwpower,/* SIOCGIWPOWER */ (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* -- hole -- */ - (iw_handler )NULL ,/* SIOCSIWGENIE */ + (iw_handler ) cfg80211_wext_siwgenie,/* SIOCSIWGENIE */ (iw_handler )NULL ,/* SIOCGIWGENIE */ - (iw_handler ) iwm_wext_siwauth,/* SIOCSIWAUTH */ - (iw_handler ) iwm_wext_giwauth,/* SIOCGIWAUTH */ + (iw_handler ) cfg80211_wext_siwauth,/* SIOCSIWAUTH */ + (iw_handler ) cfg80211_wext_giwauth,/* SIOCGIWAUTH */ (iw_handler ) cfg80211_wext_siwencodeext,/* SIOCSIWENCODEEXT */ (iw_handler )NULL ,/* SIOCGIWENCODEEXT */ (iw_handler) NULL, /* SIOCSIWPMKSA */@@ -432,6 +182,6 @@ static const iw_handler iwm_handlers[] =const struct iw_handler_def iwm_iw_handler_def = { .num_standard =ARRAY_SIZE (iwm_handlers), .standard = (iw_handler *) iwm_handlers, - .get_wireless_stats = iwm_get_wireless_stats, + .get_wireless_stats = cfg80211_wireless_stats, };Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/rx.c
===================================================================drivers/net/wireless/iwmc3200wifi/rx.c +9
-4@@ -521,7 +521,10 @@ static int iwm_mlme_assoc_complete(struciwm_link_on (iwm); -memcpy (wrqu.ap_addr.sa_data, complete->bssid,ETH_ALEN ); +cfg80211_connect_result (iwm_to_ndev (iwm), + complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_SUCCESS ,GFP_KERNEL );break ;case UMAC_ASSOC_COMPLETE_FAILURE :clear_bit (IWM_STATUS_ASSOCIATED , &iwm->status);@@ -529,6 +532,11 @@ static int iwm_mlme_assoc_complete(struc iwm->channel =0 ;iwm_link_off (iwm); + +cfg80211_connect_result (iwm_to_ndev (iwm), complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_UNSPECIFIED_FAILURE , +GFP_KERNEL );default :break ; }@@ -538,9 +546,6 @@ static int iwm_mlme_assoc_complete(strucreturn 0 ; } - wrqu.ap_addr.sa_family =ARPHRD_ETHER ; -wireless_send_event (iwm_to_ndev (iwm),SIOCGIWAP , &wrqu,NULL ); -return 0 ; }
Re: [PATCH] iwmc3200wifi: cfg80211 managed mode port
Quoted 7 lines · Johannes Berg
Quoted 4 lines · Samuel Ortiz
This patch ports iwm to the new cfg80211 managed mode API. Whenever those managed mode routines get combined with the ibss one, we will just have to entirely get rid of the wext implementation (We may have to only keep the
iw_handleruntil cfg80211 does the wext registration for us).Looks good. I'll take care of the combine part later.
Thanks in advance.
Cheers,
Samuel.
Quoted 681 lines
johannes
Quoted 679 lines
Signed-off-by Samuel Ortiz <[email protected]>--- drivers/net/wireless/iwmc3200wifi/cfg80211.c | 195 ++++++++++++++++ drivers/net/wireless/iwmc3200wifi/rx.c | 13 - drivers/net/wireless/iwmc3200wifi/wext.c | 320 ++------------------------- 3 files changed, 239 insertions(+), 289 deletions(-)Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/cfg80211.c
===================================================================drivers/net/wireless/iwmc3200wifi/cfg80211.c +195
-0@@ -305,6 +305,25 @@ static int iwm_cfg80211_set_default_key(return iwm_reset_profile (iwm); } +int iwm_cfg80211_get_station (struct wiphy *wiphy,struct net_device *ndev, +u8 *mac,struct station_info *sinfo) +{ +struct iwm_priv *iwm =ndev_to_iwm (ndev); + +if (memcmp (mac, iwm->bssid,ETH_ALEN )) +return -ENOENT ; + + sinfo->filled |=STATION_INFO_TX_BITRATE ; + sinfo->txrate.legacy = iwm->rate *10 ; + +if (test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { + sinfo->filled |=STATION_INFO_SIGNAL ; + sinfo->signal = iwm->wstats.qual.level; + } + +return 0 ; +} +int iwm_cfg80211_inform_bss (struct iwm_priv *iwm) {@@ -500,6 +519,179 @@ static int iwm_cfg80211_leave_ibss(strucreturn 0 ; } +static int iwm_set_auth_type (struct iwm_priv *iwm, +enum nl80211_auth_type sme_auth_type) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +switch (sme_auth_type) { +case NL80211_AUTHTYPE_AUTOMATIC : +case NL80211_AUTHTYPE_OPEN_SYSTEM : +IWM_DBG_WEXT (iwm,DBG ,"OPEN auth\n" ); + *auth_type =UMAC_AUTH_TYPE_OPEN ; +break ; +case NL80211_AUTHTYPE_SHARED_KEY : +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) { +IWM_DBG_WEXT (iwm,DBG ,"WPA auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; + }else { +IWM_DBG_WEXT (iwm,DBG ,"WEP shared key auth alg\n" ); + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + } + +break ; +default : +IWM_ERR (iwm,"Unsupported auth alg: 0x%x\n" , sme_auth_type); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_wpa_version (struct iwm_priv *iwm,u32 wpa_version) +{ +if (!wpa_version) { + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_LEGACY_PROFILE ; +return 0 ; + } + +if (wpa_version &NL80211_WPA_VERSION_2 ) + iwm->umac_profile->sec.flags =UMAC_SEC_FLG_RSNA_ON_MSK ; + +if (wpa_version &NL80211_WPA_VERSION_1 ) + iwm->umac_profile->sec.flags |=UMAC_SEC_FLG_WPA_ON_MSK ; + +return 0 ; +} + +static int iwm_set_cipher (struct iwm_priv *iwm,u32 cipher,bool ucast) +{ +u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher : + &iwm->umac_profile->sec.mcast_cipher; + +if (!cipher) { + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +return 0 ; + } + +switch (cipher) { +case IW_AUTH_CIPHER_NONE : + *profile_cipher =UMAC_CIPHER_TYPE_NONE ; +break ; +case WLAN_CIPHER_SUITE_WEP40 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_40 ; +break ; +case WLAN_CIPHER_SUITE_WEP104 : + *profile_cipher =UMAC_CIPHER_TYPE_WEP_104 ; +break ; +case WLAN_CIPHER_SUITE_TKIP : + *profile_cipher =UMAC_CIPHER_TYPE_TKIP ; +break ; +case WLAN_CIPHER_SUITE_CCMP : + *profile_cipher =UMAC_CIPHER_TYPE_CCMP ; +break ; +default : +IWM_ERR (iwm,"Unsupported cipher: 0x%x\n" , cipher); +return -ENOTSUPP ; + } + +return 0 ; +} + +static int iwm_set_key_mgt (struct iwm_priv *iwm,u32 key_mgt) +{ +u8 *auth_type = &iwm->umac_profile->sec.auth_type; + +IWM_DBG_WEXT (iwm,DBG ,"key_mgt: 0x%x\n" , key_mgt); + +if (key_mgt ==WLAN_AKM_SUITE_8021X ) + *auth_type =UMAC_AUTH_TYPE_8021X ; +else if (key_mgt ==WLAN_AKM_SUITE_PSK ) { +if (iwm->umac_profile->sec.flags & + (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) + *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; +else + *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; + }else { +IWM_ERR (iwm,"Invalid key mgt: 0x%x\n" , key_mgt); +return -EINVAL ; + } + +return 0 ; +} + + +static int iwm_cfg80211_connect (struct wiphy *wiphy,struct net_device *dev, +struct cfg80211_connect_params *sme) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); +struct ieee80211_channel *chan = sme->channel; +int ret; + +if (!test_bit (IWM_STATUS_READY , &iwm->status)) +return -EIO ; + +if (!sme->ssid) +return -EINVAL ; + +if (chan) + iwm->channel = +ieee80211_frequency_to_channel (chan->center_freq); + + iwm->umac_profile->ssid.ssid_len = sme->ssid_len; +memcpy (iwm->umac_profile->ssid.ssid, sme->ssid, sme->ssid_len); + +if (sme->bssid) { +IWM_DBG_WEXT (iwm,DBG ,"BSSID: %pM\n" , sme->bssid); +memcpy (&iwm->umac_profile->bssid[0 ], sme->bssid,ETH_ALEN ); + iwm->umac_profile->bss_num =1 ; + }else { +memset (&iwm->umac_profile->bssid[0 ],0 ,ETH_ALEN ); + iwm->umac_profile->bss_num =0 ; + } + + ret =iwm_set_auth_type (iwm, sme->auth_type); +if (ret <0 ) +return ret; + + ret =iwm_set_wpa_version (iwm, sme->crypto.wpa_versions); +if (ret <0 ) +return ret; + +if (sme->crypto.n_ciphers_pairwise) { + ret =iwm_set_cipher (iwm, sme->crypto.ciphers_pairwise[0 ], + true); +if (ret <0 ) +return ret; + } + + ret =iwm_set_cipher (iwm, sme->crypto.cipher_group, false); +if (ret <0 ) +return ret; + +if (sme->crypto.n_akm_suites) { + ret =iwm_set_key_mgt (iwm, sme->crypto.akm_suites[0 ]); +if (ret <0 ) +return ret; + } + +return iwm_send_mlme_profile (iwm); +} + +static int iwm_cfg80211_disconnect (struct wiphy *wiphy,struct net_device *dev, +u16 reason_code) +{ +struct iwm_priv *iwm =wiphy_to_iwm (wiphy); + +IWM_DBG_WEXT (iwm,DBG ,"Active: %d\n" , iwm->umac_profile_active); + +if (iwm->umac_profile_active) +return iwm_invalidate_mlme_profile (iwm); + +return 0 ; +} +static int iwm_cfg80211_set_txpower (struct wiphy *wiphy,enum tx_power_setting type,int dbm) {@@ -549,8 +741,11 @@ static struct cfg80211_ops iwm_cfg80211_ .get_key = iwm_cfg80211_get_key, .del_key = iwm_cfg80211_del_key, .set_default_key = iwm_cfg80211_set_default_key, + .get_station = iwm_cfg80211_get_station, .scan = iwm_cfg80211_scan, .set_wiphy_params = iwm_cfg80211_set_wiphy_params, + .connect = iwm_cfg80211_connect, + .disconnect = iwm_cfg80211_disconnect, .join_ibss = iwm_cfg80211_join_ibss, .leave_ibss = iwm_cfg80211_leave_ibss, .set_tx_power = iwm_cfg80211_set_txpower,Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/wext.c
===================================================================drivers/net/wireless/iwmc3200wifi/wext.c +35
-285@@ -21,31 +21,11 @@* */ -#include <linux/kernel.h> -#include <linux/netdevice.h> #include <linux/wireless.h> -#include <linux/if_arp.h> -#include <linux/etherdevice.h> #include <net/cfg80211.h> -#include <net/iw_handler.h> #include "iwm.h" -#include "umac.h" #include "commands.h" -#include "debug.h" - -static struct iw_statistics *iwm_get_wireless_stats (struct net_device *dev) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); -struct iw_statistics *wstats = &iwm->wstats; - -if (!test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { -memset (wstats,0 ,sizeof (struct iw_statistics )); - wstats->qual.updated =IW_QUAL_ALL_INVALID ; - } - -return wstats; -} static int iwm_wext_siwfreq(struct net_device *dev, struct iw_request_info *info,@@ -53,14 +33,12 @@ static int iwm_wext_siwfreq(struct net_d {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (freq->flags ==IW_FREQ_AUTO ) -return 0 ; - -/* frequency/channel can only be set in IBSS mode */ -if (iwm->conf.mode !=UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS : +return cfg80211_ibss_wext_giwfreq (dev, info, freq, extra); +default :return -EOPNOTSUPP ; - -return cfg80211_ibss_wext_siwfreq (dev, info, freq, extra); + } } static int iwm_wext_giwfreq(struct net_device *dev,@@ -69,69 +47,29 @@ static int iwm_wext_giwfreq(struct net_d {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwfreq (dev, info, freq, extra); - - freq->e =0 ; - freq->m = iwm->channel; - -return 0 ; +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_giwfreq (dev, info, freq, extra); +default : +return -EOPNOTSUPP ; + } }static int iwm_wext_siwap (struct net_device *dev,struct iw_request_info *info,struct sockaddr *ap_addr,char *extra) {struct iwm_priv *iwm =ndev_to_iwm (dev); -int ret; - -IWM_DBG_WEXT (iwm,DBG ,"Set BSSID: %pM\n" , ap_addr->sa_data); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_siwap (dev, info, ap_addr, extra); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - -if (is_zero_ether_addr (ap_addr->sa_data) || -is_broadcast_ether_addr (ap_addr->sa_data)) { -IWM_DBG_WEXT (iwm,DBG ,"clear mandatory bssid %pM\n" , - iwm->umac_profile->bssid[0 ]); -memset (&iwm->umac_profile->bssid[0 ],0 ,ETH_ALEN ); - iwm->umac_profile->bss_num =0 ; - }else { -IWM_DBG_WEXT (iwm,DBG ,"add mandatory bssid %pM\n" , - ap_addr->sa_data); -memcpy (&iwm->umac_profile->bssid[0 ], ap_addr->sa_data, -ETH_ALEN ); - iwm->umac_profile->bss_num =1 ; - } - -if (iwm->umac_profile_active) { -int i; - -if (!memcmp (&iwm->umac_profile->bssid[0 ], iwm->bssid,ETH_ALEN )) -return 0 ; - -/* -* If we're clearing the BSSID, and we're associated, -* we have to clear the keys as they're no longer valid. -*/ -if (is_zero_ether_addr (ap_addr->sa_data)) { -for (i =0 ; i <IWM_NUM_KEYS ; i++) - iwm->keys[i].key_len =0 ; - } - - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_siwap (dev, info, ap_addr, extra); +default : +return -EOPNOTSUPP ; } - -if (iwm->umac_profile->ssid.ssid_len) -return iwm_send_mlme_profile (iwm); - -return 0 ; } static int iwm_wext_giwap(struct net_device *dev, struct iw_request_info *info,@@ -143,17 +81,10 @@ static int iwm_wext_giwap(struct net_devcase UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwap (dev, info, ap_addr, extra);case UMAC_MODE_BSS : -if (test_bit (IWM_STATUS_ASSOCIATED , &iwm->status)) { - ap_addr->sa_family =ARPHRD_ETHER ; -memcpy (&ap_addr->sa_data, iwm->bssid,ETH_ALEN ); - }else -memset (&ap_addr->sa_data,0 ,ETH_ALEN ); -break ; +return cfg80211_mgd_wext_giwap (dev, info, ap_addr, extra);default :return -EOPNOTSUPP ; } - -return 0 ; } static int iwm_wext_siwessid(struct net_device *dev,@@ -161,36 +92,15 @@ static int iwm_wext_siwessid(struct net_ struct iw_point *data, char *ssid) { struct iwm_priv *iwm = ndev_to_iwm(dev); -size_t len = data->length; -int ret; - -IWM_DBG_WEXT (iwm,DBG ,"Set ESSID: >%s<\n" , ssid); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_siwessid (dev, info, data, ssid); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - -if (len >0 && ssid[len -1 ] =='\0' ) - len--; - -if (iwm->umac_profile_active) { -if (iwm->umac_profile->ssid.ssid_len == len && - !memcmp (iwm->umac_profile->ssid.ssid, ssid, len)) -return 0 ; - - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_siwessid (dev, info, data, ssid); +default : +return -EOPNOTSUPP ; } - - iwm->umac_profile->ssid.ssid_len = len; -memcpy (iwm->umac_profile->ssid.ssid, ssid, len); - -return iwm_send_mlme_profile (iwm); } static int iwm_wext_giwessid(struct net_device *dev,@@ -199,174 +109,14 @@ static int iwm_wext_giwessid(struct net_ {struct iwm_priv *iwm =ndev_to_iwm (dev); -if (iwm->conf.mode ==UMAC_MODE_IBSS ) +switch (iwm->conf.mode) { +case UMAC_MODE_IBSS :return cfg80211_ibss_wext_giwessid (dev, info, data, ssid); - -if (!test_bit (IWM_STATUS_READY , &iwm->status)) -return -EIO ; - - data->length = iwm->umac_profile->ssid.ssid_len; -if (data->length) { -memcpy (ssid, iwm->umac_profile->ssid.ssid, data->length); - data->flags =1 ; - }else - data->flags =0 ; - -return 0 ; -} - -static int iwm_wext_giwrate (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *rate,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); - - rate->value = iwm->rate *1000000 ; - -return 0 ; -} - -static int iwm_set_wpa_version (struct iwm_priv *iwm,u8 wpa_version) -{ -if (wpa_version &IW_AUTH_WPA_VERSION_WPA2 ) - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_RSNA_ON_MSK ; -else if (wpa_version &IW_AUTH_WPA_VERSION_WPA ) - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_WPA_ON_MSK ; -else - iwm->umac_profile->sec.flags =UMAC_SEC_FLG_LEGACY_PROFILE ; - -return 0 ; -} - -static int iwm_set_key_mgt (struct iwm_priv *iwm,u8 key_mgt) -{ -u8 *auth_type = &iwm->umac_profile->sec.auth_type; - -IWM_DBG_WEXT (iwm,DBG ,"key_mgt: 0x%x\n" , key_mgt); - -if (key_mgt ==IW_AUTH_KEY_MGMT_802_1X ) - *auth_type =UMAC_AUTH_TYPE_8021X ; -else if (key_mgt ==IW_AUTH_KEY_MGMT_PSK ) { -if (iwm->umac_profile->sec.flags & - (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) - *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; -else - *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; - }else { -IWM_ERR (iwm,"Invalid key mgt: 0x%x\n" , key_mgt); -return -EINVAL ; - } - -return 0 ; -} - -static int iwm_set_cipher (struct iwm_priv *iwm,u8 cipher,u8 ucast) -{ -u8 *profile_cipher = ucast ? &iwm->umac_profile->sec.ucast_cipher : - &iwm->umac_profile->sec.mcast_cipher; - -switch (cipher) { -case IW_AUTH_CIPHER_NONE : - *profile_cipher =UMAC_CIPHER_TYPE_NONE ; -break ; -case IW_AUTH_CIPHER_WEP40 : - *profile_cipher =UMAC_CIPHER_TYPE_WEP_40 ; -break ; -case IW_AUTH_CIPHER_TKIP : - *profile_cipher =UMAC_CIPHER_TYPE_TKIP ; -break ; -case IW_AUTH_CIPHER_CCMP : - *profile_cipher =UMAC_CIPHER_TYPE_CCMP ; -break ; -case IW_AUTH_CIPHER_WEP104 : - *profile_cipher =UMAC_CIPHER_TYPE_WEP_104 ; -break ; -default : -IWM_ERR (iwm,"Unsupported cipher: 0x%x\n" , cipher); -return -ENOTSUPP ; - } - -return 0 ; -} - -static int iwm_set_auth_alg (struct iwm_priv *iwm,u8 auth_alg) -{ -u8 *auth_type = &iwm->umac_profile->sec.auth_type; - -IWM_DBG_WEXT (iwm,DBG ,"auth_alg: 0x%x\n" , auth_alg); - -switch (auth_alg) { -case IW_AUTH_ALG_OPEN_SYSTEM : - *auth_type =UMAC_AUTH_TYPE_OPEN ; -break ; -case IW_AUTH_ALG_SHARED_KEY : -if (iwm->umac_profile->sec.flags & - (UMAC_SEC_FLG_WPA_ON_MSK |UMAC_SEC_FLG_RSNA_ON_MSK )) { -if (*auth_type ==UMAC_AUTH_TYPE_8021X ) -return -EINVAL ; - *auth_type =UMAC_AUTH_TYPE_RSNA_PSK ; - }else { -IWM_DBG_WEXT (iwm,DBG ,"WEP shared key\n" ); - *auth_type =UMAC_AUTH_TYPE_LEGACY_PSK ; - } -break ; -case IW_AUTH_ALG_LEAP : -default : -IWM_ERR (iwm,"Unsupported auth alg: 0x%x\n" , auth_alg); -return -ENOTSUPP ; - } - -return 0 ; -} - -static int iwm_wext_siwauth (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *data,char *extra) -{ -struct iwm_priv *iwm =ndev_to_iwm (dev); -int ret; - -if ((data->flags) & - (IW_AUTH_WPA_VERSION |IW_AUTH_KEY_MGMT | -IW_AUTH_WPA_ENABLED |IW_AUTH_80211_AUTH_ALG )) { -/* We need to invalidate the current profile */ -if (iwm->umac_profile_active) { - ret =iwm_invalidate_mlme_profile (iwm); -if (ret <0 ) { -IWM_ERR (iwm,"Couldn't invalidate profile\n" ); -return ret; - } - } - } - -switch (data->flags &IW_AUTH_INDEX ) { -case IW_AUTH_WPA_VERSION : -return iwm_set_wpa_version (iwm, data->value); -break ; -case IW_AUTH_CIPHER_PAIRWISE : -return iwm_set_cipher (iwm, data->value,1 ); -break ; -case IW_AUTH_CIPHER_GROUP : -return iwm_set_cipher (iwm, data->value,0 ); -break ; -case IW_AUTH_KEY_MGMT : -return iwm_set_key_mgt (iwm, data->value); -break ; -case IW_AUTH_80211_AUTH_ALG : -return iwm_set_auth_alg (iwm, data->value); -break ; +case UMAC_MODE_BSS : +return cfg80211_mgd_wext_giwessid (dev, info, data, ssid);default : -return -ENOTSUPP ; +return -EOPNOTSUPP ; } - -return 0 ; -} - -static int iwm_wext_giwauth (struct net_device *dev, -struct iw_request_info *info, -struct iw_param *data,char *extra) -{ -return 0 ; } static const iw_handler iwm_handlers[] =@@ -404,7 +154,7 @@ static const iw_handler iwm_handlers[] = (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* SIOCSIWRATE */ - (iw_handler ) iwm_wext_giwrate,/* SIOCGIWRATE */ + (iw_handler ) cfg80211_wext_giwrate,/* SIOCGIWRATE */ (iw_handler ) cfg80211_wext_siwrts,/* SIOCSIWRTS */ (iw_handler ) cfg80211_wext_giwrts,/* SIOCGIWRTS */ (iw_handler) cfg80211_wext_siwfrag, /* SIOCSIWFRAG */@@ -419,10 +169,10 @@ static const iw_handler iwm_handlers[] = (iw_handler ) cfg80211_wext_giwpower,/* SIOCGIWPOWER */ (iw_handler )NULL ,/* -- hole -- */ (iw_handler )NULL ,/* -- hole -- */ - (iw_handler )NULL ,/* SIOCSIWGENIE */ + (iw_handler ) cfg80211_wext_siwgenie,/* SIOCSIWGENIE */ (iw_handler )NULL ,/* SIOCGIWGENIE */ - (iw_handler ) iwm_wext_siwauth,/* SIOCSIWAUTH */ - (iw_handler ) iwm_wext_giwauth,/* SIOCGIWAUTH */ + (iw_handler ) cfg80211_wext_siwauth,/* SIOCSIWAUTH */ + (iw_handler ) cfg80211_wext_giwauth,/* SIOCGIWAUTH */ (iw_handler ) cfg80211_wext_siwencodeext,/* SIOCSIWENCODEEXT */ (iw_handler )NULL ,/* SIOCGIWENCODEEXT */ (iw_handler) NULL, /* SIOCSIWPMKSA */@@ -432,6 +182,6 @@ static const iw_handler iwm_handlers[] =const struct iw_handler_def iwm_iw_handler_def = { .num_standard =ARRAY_SIZE (iwm_handlers), .standard = (iw_handler *) iwm_handlers, - .get_wireless_stats = iwm_get_wireless_stats, + .get_wireless_stats = cfg80211_wireless_stats, };Index:
iwm-2.6/drivers/net/wireless/iwmc3200wifi/rx.c
===================================================================drivers/net/wireless/iwmc3200wifi/rx.c +9
-4@@ -521,7 +521,10 @@ static int iwm_mlme_assoc_complete(struciwm_link_on (iwm); -memcpy (wrqu.ap_addr.sa_data, complete->bssid,ETH_ALEN ); +cfg80211_connect_result (iwm_to_ndev (iwm), + complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_SUCCESS ,GFP_KERNEL );break ;case UMAC_ASSOC_COMPLETE_FAILURE :clear_bit (IWM_STATUS_ASSOCIATED , &iwm->status);@@ -529,6 +532,11 @@ static int iwm_mlme_assoc_complete(struc iwm->channel =0 ;iwm_link_off (iwm); + +cfg80211_connect_result (iwm_to_ndev (iwm), complete->bssid, +NULL ,0 ,NULL ,0 , +WLAN_STATUS_UNSPECIFIED_FAILURE , +GFP_KERNEL );default :break ; }@@ -538,9 +546,6 @@ static int iwm_mlme_assoc_complete(strucreturn 0 ; } - wrqu.ap_addr.sa_family =ARPHRD_ETHER ; -wireless_send_event (iwm_to_ndev (iwm),SIOCGIWAP , &wrqu,NULL ); -return 0 ; }
Signature · 13 lines
Intel Open Source Technology Centre http://oss.intel.com/ --------------------------------------------------------------------- Intel Corporation SAS (French simplified joint stock company) Registered headquarters: "Les Montalets"- 2, rue de Paris, 92196 Meudon Cedex, France Registration Number: 302 456 199 R.C.S. NANTERRE Capital: 4,572,000 Euros This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies.
Johannes Berg
maintainerRe: [PATCH] iwmc3200wifi: cfg80211 managed mode port
In reply to Samuel OrtizReview static int iwm_mlme_assoc_complete(struc
Quoted 1 line · Samuel Ortiz
(quoted diff) +0
-0@@ -521,7 +521,10 @@ static int iwm_mlme_assoc_complete(struc
- union iwreq_data wrqu;
- memset(&wrqu, 0, sizeof(wrqu));
johannes