Commit 51cd4aab authored by David Kilroy's avatar David Kilroy Committed by John W. Linville
Browse files

cfg80211: allow drivers that can't scan for specific ssids 



Signed-off-by: default avatarDavid Kilroy <kilroyd@googlemail.com>
Acked-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3daf0975

net/wireless/core.c

+0 −3
Original line number Diff line number Diff line
@@ -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;

net/wireless/wext-compat.c

+2 −1
Original line number Diff line number Diff line
@@ -247,6 +247,7 @@ int cfg80211_wext_giwrange(struct net_device *dev, 
	IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWAP);

	IW_EVENT_CAPA_SET(range->event_capa, SIOCGIWSCAN);



	if (wdev->wiphy->max_scan_ssids > 0)

		range->scan_capa |= IW_SCAN_CAPA_ESSID;



	return 0;