leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libertas: make association debug output nicer

Browse Source 
This also fixes a bug where should_deauth_infrastructure() always
returned 0.

Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Holger Schurig 2008-01-28 17:25:53 +01:00 committed by John W. Linville
parent 1afc09ab7c
commit 52507c2087
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/wireless/libertas/assoc.c
View File

@ -413,11 +413,10 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
{ {
int ret = 0; int ret = 0;
lbs_deb_enter(LBS_DEB_ASSOC);
if (priv->connect_status != LBS_CONNECTED) if (priv->connect_status != LBS_CONNECTED)
return 0; return 0;
lbs_deb_enter(LBS_DEB_ASSOC);
if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) { if (test_bit(ASSOC_FLAG_SSID, &assoc_req->flags)) {
lbs_deb_assoc("Deauthenticating due to new SSID\n"); lbs_deb_assoc("Deauthenticating due to new SSID\n");
ret = 1; ret = 1;
@ -456,7 +455,7 @@ static int should_deauth_infrastructure(struct lbs_private *priv,
out: out:
lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret); lbs_deb_leave_args(LBS_DEB_ASSOC, "ret %d", ret);
return 0; return ret;
} }
@ -643,9 +642,7 @@ void lbs_association_worker(struct work_struct *work)
} }
if (success) { if (success) {
lbs_deb_assoc("ASSOC: associated to '%s', %s\n", lbs_deb_assoc("associated to %s\n",
escape_essid(priv->curbssparams.ssid,
priv->curbssparams.ssid_len),
print_mac(mac, priv->curbssparams.bssid)); print_mac(mac, priv->curbssparams.bssid));
lbs_prepare_and_send_command(priv, lbs_prepare_and_send_command(priv,
CMD_802_11_RSSI, CMD_802_11_RSSI,

2
drivers/net/wireless/libertas/cmdresp.c
View File

@ -74,7 +74,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv)
lbs_deb_cmd("disconnected, so exit PS mode\n"); lbs_deb_cmd("disconnected, so exit PS mode\n");
lbs_ps_wakeup(priv, 0); lbs_ps_wakeup(priv, 0);
} }
lbs_deb_leave(LBS_DEB_CMD); lbs_deb_leave(LBS_DEB_ASSOC);
} }
/** /**

3
drivers/net/wireless/libertas/join.c
View File

@ -769,9 +769,6 @@ int lbs_ret_80211_associate(struct lbs_private *priv,
priv->curbssparams.ssid_len = bss->ssid_len; priv->curbssparams.ssid_len = bss->ssid_len;
memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN); memcpy(priv->curbssparams.bssid, bss->bssid, ETH_ALEN);
lbs_deb_assoc("ASSOC_RESP: currentpacketfilter is 0x%x\n",
priv->currentpacketfilter);
priv->SNR[TYPE_RXPD][TYPE_AVG] = 0; priv->SNR[TYPE_RXPD][TYPE_AVG] = 0;
priv->NF[TYPE_RXPD][TYPE_AVG] = 0; priv->NF[TYPE_RXPD][TYPE_AVG] = 0;