Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 183869
b: refs/heads/master
c: 64147c7
h: refs/heads/master
i:
  183867: 0e30c77
v: v3
  • Loading branch information
John W. Linville committed Jan 19, 2010
1 parent 818128b commit b84b000
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 33 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c9f6a6567f3e8dd69dd3f80a67e73d7d10884bea
refs/heads/master: 64147c729732ba9c9e50966971bdfbd503c888bb
62 changes: 30 additions & 32 deletions trunk/drivers/net/wireless/libertas/assoc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1160,11 +1160,11 @@ int lbs_adhoc_stop(struct lbs_private *priv)
static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,
struct bss_descriptor *match_bss)
{
if (!secinfo->wep_enabled && !secinfo->WPAenabled
&& !secinfo->WPA2enabled
&& match_bss->wpa_ie[0] != WLAN_EID_GENERIC
&& match_bss->rsn_ie[0] != WLAN_EID_RSN
&& !(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
if (!secinfo->wep_enabled &&
!secinfo->WPAenabled && !secinfo->WPA2enabled &&
match_bss->wpa_ie[0] != WLAN_EID_GENERIC &&
match_bss->rsn_ie[0] != WLAN_EID_RSN &&
!(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
return 1;
else
return 0;
Expand All @@ -1173,9 +1173,9 @@ static inline int match_bss_no_security(struct lbs_802_11_security *secinfo,
static inline int match_bss_static_wep(struct lbs_802_11_security *secinfo,
struct bss_descriptor *match_bss)
{
if (secinfo->wep_enabled && !secinfo->WPAenabled
&& !secinfo->WPA2enabled
&& (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
if (secinfo->wep_enabled &&
!secinfo->WPAenabled && !secinfo->WPA2enabled &&
(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
return 1;
else
return 0;
Expand All @@ -1184,8 +1184,8 @@ static inline int match_bss_static_wep(struct lbs_802_11_security *secinfo,
static inline int match_bss_wpa(struct lbs_802_11_security *secinfo,
struct bss_descriptor *match_bss)
{
if (!secinfo->wep_enabled && secinfo->WPAenabled
&& (match_bss->wpa_ie[0] == WLAN_EID_GENERIC)
if (!secinfo->wep_enabled && secinfo->WPAenabled &&
(match_bss->wpa_ie[0] == WLAN_EID_GENERIC)
/* privacy bit may NOT be set in some APs like LinkSys WRT54G
&& (match_bss->capability & WLAN_CAPABILITY_PRIVACY) */
)
Expand All @@ -1210,11 +1210,11 @@ static inline int match_bss_wpa2(struct lbs_802_11_security *secinfo,
static inline int match_bss_dynamic_wep(struct lbs_802_11_security *secinfo,
struct bss_descriptor *match_bss)
{
if (!secinfo->wep_enabled && !secinfo->WPAenabled
&& !secinfo->WPA2enabled
&& (match_bss->wpa_ie[0] != WLAN_EID_GENERIC)
&& (match_bss->rsn_ie[0] != WLAN_EID_RSN)
&& (match_bss->capability & WLAN_CAPABILITY_PRIVACY))
if (!secinfo->wep_enabled &&
!secinfo->WPAenabled && !secinfo->WPA2enabled &&
(match_bss->wpa_ie[0] != WLAN_EID_GENERIC) &&
(match_bss->rsn_ie[0] != WLAN_EID_RSN) &&
(match_bss->capability & WLAN_CAPABILITY_PRIVACY))
return 1;
else
return 0;
Expand Down Expand Up @@ -1525,8 +1525,8 @@ static int assoc_helper_associate(struct lbs_private *priv,
/* If we're given and 'any' BSSID, try associating based on SSID */

if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
if (compare_ether_addr(bssid_any, assoc_req->bssid)
&& compare_ether_addr(bssid_off, assoc_req->bssid)) {
if (compare_ether_addr(bssid_any, assoc_req->bssid) &&
compare_ether_addr(bssid_off, assoc_req->bssid)) {
ret = assoc_helper_bssid(priv, assoc_req);
done = 1;
}
Expand Down Expand Up @@ -1612,11 +1612,9 @@ static int assoc_helper_channel(struct lbs_private *priv,
goto restore_mesh;
}

if ( assoc_req->secinfo.wep_enabled
&& (assoc_req->wep_keys[0].len
|| assoc_req->wep_keys[1].len
|| assoc_req->wep_keys[2].len
|| assoc_req->wep_keys[3].len)) {
if (assoc_req->secinfo.wep_enabled &&
(assoc_req->wep_keys[0].len || assoc_req->wep_keys[1].len ||
assoc_req->wep_keys[2].len || assoc_req->wep_keys[3].len)) {
/* Make sure WEP keys are re-sent to firmware */
set_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags);
}
Expand Down Expand Up @@ -1983,14 +1981,14 @@ void lbs_association_worker(struct work_struct *work)
assoc_req->secinfo.auth_mode);

/* If 'any' SSID was specified, find an SSID to associate with */
if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)
&& !assoc_req->ssid_len)
if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags) &&
!assoc_req->ssid_len)
find_any_ssid = 1;

/* But don't use 'any' SSID if there's a valid locked BSSID to use */
if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)) {
if (compare_ether_addr(assoc_req->bssid, bssid_any)
&& compare_ether_addr(assoc_req->bssid, bssid_off))
if (compare_ether_addr(assoc_req->bssid, bssid_any) &&
compare_ether_addr(assoc_req->bssid, bssid_off))
find_any_ssid = 0;
}

Expand Down Expand Up @@ -2064,15 +2062,15 @@ void lbs_association_worker(struct work_struct *work)
goto out;
}

if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags)
|| test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
if (test_bit(ASSOC_FLAG_WPA_MCAST_KEY, &assoc_req->flags) ||
test_bit(ASSOC_FLAG_WPA_UCAST_KEY, &assoc_req->flags)) {
ret = assoc_helper_wpa_keys(priv, assoc_req);
if (ret)
goto out;
}

if ( test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags)
|| test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
if (test_bit(ASSOC_FLAG_WEP_KEYS, &assoc_req->flags) ||
test_bit(ASSOC_FLAG_WEP_TX_KEYIDX, &assoc_req->flags)) {
ret = assoc_helper_wep_keys(priv, assoc_req);
if (ret)
goto out;
Expand All @@ -2082,8 +2080,8 @@ void lbs_association_worker(struct work_struct *work)
/* SSID/BSSID should be the _last_ config option set, because they
* trigger the association attempt.
*/
if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags)
|| test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
if (test_bit(ASSOC_FLAG_BSSID, &assoc_req->flags) ||
test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
int success = 1;

ret = assoc_helper_associate(priv, assoc_req);
Expand Down

0 comments on commit b84b000

Please sign in to comment.