diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-16 00:33:28 +0300 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-16 00:33:28 +0300 |
| commit | 1fcfe76a760e78d7774a254608557c84071b0cfb (patch) | |
| tree | 2659028625a15a6bcbef350d16ace21982f714d4 /drivers/net/wireless/libertas | |
| parent | 0c8173385e549f95cd80c3fff5aab87b4f881d8d (diff) | |
| parent | 56e6417b49132d4f56e9f2241d31942b90b46315 (diff) | |
| download | linux-1fcfe76a760e78d7774a254608557c84071b0cfb.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
Diffstat (limited to 'drivers/net/wireless/libertas')
| -rw-r--r-- | drivers/net/wireless/libertas/cfg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/libertas/cfg.c b/drivers/net/wireless/libertas/cfg.c index 300be1931826..698a1f7694ed 100644 --- a/drivers/net/wireless/libertas/cfg.c +++ b/drivers/net/wireless/libertas/cfg.c @@ -617,7 +617,7 @@ static int lbs_ret_scan(struct lbs_private *priv, unsigned long dummy, print_ssid(ssid_buf, ssid, ssid_len), LBS_SCAN_RSSI_TO_MBM(rssi)/100); - if (channel || + if (channel && !(channel->flags & IEEE80211_CHAN_DISABLED)) cfg80211_inform_bss(wiphy, channel, bssid, le64_to_cpu(*(__le64 *)tsfdesc), |