Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 070bb547 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

mac80211: don't probe if we have probe response 



We can now easily determine whether we already
have probe response information for the BSS we
are asked to connect to, in which case there's
little point in probing the BSS again.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 33e5a2f7

net/mac80211/mlme.c

+5 −5
Original line number Diff line number Diff line
@@ -27,10 +27,6 @@ 
#include "rate.h"

#include "led.h"



#define IEEE80211_AUTH_TIMEOUT (HZ / 5)

#define IEEE80211_AUTH_MAX_TRIES 3

#define IEEE80211_ASSOC_TIMEOUT (HZ / 5)

#define IEEE80211_ASSOC_MAX_TRIES 3

#define IEEE80211_MAX_PROBE_TRIES 5



/*
@@ -1844,6 +1840,10 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, 
	wk->probe_auth.algorithm = auth_alg;

	wk->probe_auth.privacy = req->bss->capability & WLAN_CAPABILITY_PRIVACY;



	/* if we already have a probe, don't probe again */

	if (req->bss->proberesp_ies)

		wk->type = IEEE80211_WORK_AUTH;

	else

		wk->type = IEEE80211_WORK_DIRECT_PROBE;

	wk->chan = req->bss->channel;

	wk->sdata = sdata;