[PATCH] mac80211: honor IW_SCAN_THIS_ESSID in siwscan ioctl
This patch fixes the problem of associating with wpa_secured hidden AP. Please try out. The original author of this patch is Bill Moss <bmoss@clemson.edu> Signed-off-by: Abhijeet Kolekar <abhijeet.kolekar@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
cffdd30d20
commit
107acb23ba
|
@ -511,32 +511,40 @@ static int ieee80211_ioctl_giwap(struct net_device *dev,
|
||||||
|
|
||||||
static int ieee80211_ioctl_siwscan(struct net_device *dev,
|
static int ieee80211_ioctl_siwscan(struct net_device *dev,
|
||||||
struct iw_request_info *info,
|
struct iw_request_info *info,
|
||||||
struct iw_point *data, char *extra)
|
union iwreq_data *wrqu, char *extra)
|
||||||
{
|
{
|
||||||
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
|
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
|
||||||
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);
|
||||||
|
struct iw_scan_req *req = NULL;
|
||||||
u8 *ssid = NULL;
|
u8 *ssid = NULL;
|
||||||
size_t ssid_len = 0;
|
size_t ssid_len = 0;
|
||||||
|
|
||||||
if (!netif_running(dev))
|
if (!netif_running(dev))
|
||||||
return -ENETDOWN;
|
return -ENETDOWN;
|
||||||
|
|
||||||
switch (sdata->type) {
|
if (wrqu->data.length == sizeof(struct iw_scan_req) &&
|
||||||
case IEEE80211_IF_TYPE_STA:
|
wrqu->data.flags & IW_SCAN_THIS_ESSID) {
|
||||||
case IEEE80211_IF_TYPE_IBSS:
|
req = (struct iw_scan_req *)extra;
|
||||||
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
|
ssid = req->essid;
|
||||||
ssid = sdata->u.sta.ssid;
|
ssid_len = req->essid_len;
|
||||||
ssid_len = sdata->u.sta.ssid_len;
|
} else {
|
||||||
|
switch (sdata->type) {
|
||||||
|
case IEEE80211_IF_TYPE_STA:
|
||||||
|
case IEEE80211_IF_TYPE_IBSS:
|
||||||
|
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
|
||||||
|
ssid = sdata->u.sta.ssid;
|
||||||
|
ssid_len = sdata->u.sta.ssid_len;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
case IEEE80211_IF_TYPE_AP:
|
||||||
|
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
|
||||||
|
ssid = sdata->u.ap.ssid;
|
||||||
|
ssid_len = sdata->u.ap.ssid_len;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
return -EOPNOTSUPP;
|
||||||
}
|
}
|
||||||
break;
|
|
||||||
case IEEE80211_IF_TYPE_AP:
|
|
||||||
if (local->scan_flags & IEEE80211_SCAN_MATCH_SSID) {
|
|
||||||
ssid = sdata->u.ap.ssid;
|
|
||||||
ssid_len = sdata->u.ap.ssid_len;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
return -EOPNOTSUPP;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return ieee80211_sta_req_scan(dev, ssid, ssid_len);
|
return ieee80211_sta_req_scan(dev, ssid, ssid_len);
|
||||||
|
|
Loading…
Reference in a new issue