From 3e9b89dc79a2c4871f7945199f5af00bc1c2af9f Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Mon, 8 Sep 2008 17:58:23 +0200 Subject: [PATCH] --- yaml --- r: 111637 b: refs/heads/master c: a0fe8b3349bdee27065b57cdceb2ca53c1487866 h: refs/heads/master i: 111635: 9ee1e13d5ea258c2e3a024afafdcb639900fce54 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index dbe03c853fe7..e64e216f1084 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9116dd01120e249dc2e84e6edecd7ad7f828680f +refs/heads/master: a0fe8b3349bdee27065b57cdceb2ca53c1487866 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index f43ca7b88d57..f4cbe5cc56c5 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -3052,10 +3052,7 @@ void ieee80211_sta_work(struct work_struct *work) ifsta->state != IEEE80211_STA_MLME_AUTHENTICATE && ifsta->state != IEEE80211_STA_MLME_ASSOCIATE && test_and_clear_bit(IEEE80211_STA_REQ_SCAN, &ifsta->request)) { - if (ifsta->scan_ssid_len) - ieee80211_sta_start_scan(sdata, ifsta->scan_ssid, ifsta->scan_ssid_len); - else - ieee80211_sta_start_scan(sdata, NULL, 0); + ieee80211_sta_start_scan(sdata, ifsta->scan_ssid, ifsta->scan_ssid_len); return; }