From aa34e76bc5beabe610be2b449784523f6ba664a9 Mon Sep 17 00:00:00 2001 From: David Kilroy Date: Thu, 18 Jun 2009 23:21:15 +0100 Subject: [PATCH] --- yaml --- r: 158842 b: refs/heads/master c: 51cd4aabd082144881644c308647ca501690b68c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/wireless/core.c | 3 --- trunk/net/wireless/wext-compat.c | 3 ++- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 46896c2d2771..7ad341d993ed 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3daf097594d398b2ddd2dca6caeaa92cb9148e23 +refs/heads/master: 51cd4aabd082144881644c308647ca501690b68c diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c index d5850292b3df..a98670ca98b8 100644 --- a/trunk/net/wireless/core.c +++ b/trunk/net/wireless/core.c @@ -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; diff --git a/trunk/net/wireless/wext-compat.c b/trunk/net/wireless/wext-compat.c index 7dbe6c62e5c8..bb97061219ca 100644 --- a/trunk/net/wireless/wext-compat.c +++ b/trunk/net/wireless/wext-compat.c @@ -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; }