Skip to content

Commit

Permalink
cfg80211: allow drivers that can't scan for specific ssids
Browse files Browse the repository at this point in the history 
Signed-off-by: David Kilroy <kilroyd@googlemail.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
David Kilroy authored and John W. Linville committed Jul 10, 2009
1 parent 3daf097 commit 51cd4aa
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 0 additions & 3 deletions net/wireless/core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,9 +346,6 @@ int wiphy_register(struct wiphy *wiphy)
int i;
u16 ifmodes = wiphy->interface_modes;

if (WARN_ON(wiphy->max_scan_ssids < 1))
return -EINVAL;

/* sanity check ifmodes */
WARN_ON(!ifmodes);
ifmodes &= ((1 << __NL80211_IFTYPE_AFTER_LAST) - 1) & ~1;
Expand Down
3 changes: 2 additions & 1 deletion net/wireless/wext-compat.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,8 @@ int cfg80211_wext_giwrange(struct net_device *dev,
IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);
IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);

range->scan_capa |= IW_SCAN_CAPA_ESSID;
if (wdev->wiphy->max_scan_ssids > 0)
range->scan_capa |= IW_SCAN_CAPA_ESSID;

return 0;
}
Expand Down

0 comments on commit 51cd4aa

Please sign in to comment.