From: Johannes Berg <johannes@sipsolutions.net>
To: John Linville <linville@tuxdriver.com>
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH 6/6] mac80211: rewrite a few work messages
Date: Wed, 02 Dec 2009 12:43:47 +0100 [thread overview]
Message-ID: <20091202114647.401535512@sipsolutions.net> (raw)
In-Reply-To: 20091202114341.088046714@sipsolutions.net
The station we're authenticating/associating with
may not always be an AP in the sense that word is
mostly understood, so print only the MAC address
of the peer instead.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
---
net/mac80211/work.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
--- wireless-testing.orig/net/mac80211/work.c 2009-12-01 18:27:46.000000000 +0100
+++ wireless-testing/net/mac80211/work.c 2009-12-01 18:28:21.000000000 +0100
@@ -376,7 +376,7 @@ ieee80211_direct_probe(struct ieee80211_
wk->probe_auth.tries++;
if (wk->probe_auth.tries > IEEE80211_AUTH_MAX_TRIES) {
- printk(KERN_DEBUG "%s: direct probe to AP %pM timed out\n",
+ printk(KERN_DEBUG "%s: direct probe to %pM timed out\n",
sdata->name, wk->filter_ta);
/*
@@ -394,7 +394,7 @@ ieee80211_direct_probe(struct ieee80211_
return WORK_ACT_TIMEOUT;
}
- printk(KERN_DEBUG "%s: direct probe to AP %pM (try %d)\n",
+ printk(KERN_DEBUG "%s: direct probe to %pM (try %d)\n",
sdata->name, wk->filter_ta, wk->probe_auth.tries);
/*
@@ -419,7 +419,7 @@ ieee80211_authenticate(struct ieee80211_
wk->probe_auth.tries++;
if (wk->probe_auth.tries > IEEE80211_AUTH_MAX_TRIES) {
- printk(KERN_DEBUG "%s: authentication with AP %pM"
+ printk(KERN_DEBUG "%s: authentication with %pM"
" timed out\n", sdata->name, wk->filter_ta);
/*
@@ -437,7 +437,7 @@ ieee80211_authenticate(struct ieee80211_
return WORK_ACT_TIMEOUT;
}
- printk(KERN_DEBUG "%s: authenticate with AP %pM (try %d)\n",
+ printk(KERN_DEBUG "%s: authenticate with %pM (try %d)\n",
sdata->name, wk->filter_ta, wk->probe_auth.tries);
ieee80211_send_auth(sdata, 1, wk->probe_auth.algorithm, wk->ie,
@@ -458,7 +458,7 @@ ieee80211_associate(struct ieee80211_wor
wk->assoc.tries++;
if (wk->assoc.tries > IEEE80211_ASSOC_MAX_TRIES) {
- printk(KERN_DEBUG "%s: association with AP %pM"
+ printk(KERN_DEBUG "%s: association with %pM"
" timed out\n",
sdata->name, wk->filter_ta);
@@ -479,7 +479,7 @@ ieee80211_associate(struct ieee80211_wor
return WORK_ACT_TIMEOUT;
}
- printk(KERN_DEBUG "%s: associate with AP %pM (try %d)\n",
+ printk(KERN_DEBUG "%s: associate with %pM (try %d)\n",
sdata->name, wk->filter_ta, wk->assoc.tries);
ieee80211_send_assoc(sdata, wk);
@@ -592,9 +592,9 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
u32 tu, ms;
tu = get_unaligned_le32(elems.timeout_int + 1);
ms = tu * 1024 / 1000;
- printk(KERN_DEBUG "%s: AP rejected association temporarily; "
+ printk(KERN_DEBUG "%s: %pM rejected association temporarily; "
"comeback duration %u TU (%u ms)\n",
- sdata->name, tu, ms);
+ sdata->name, mgmt->sa, tu, ms);
wk->timeout = jiffies + msecs_to_jiffies(ms);
if (ms > IEEE80211_ASSOC_TIMEOUT)
run_again(local, wk->timeout);
@@ -602,8 +602,8 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee
}
if (status_code != WLAN_STATUS_SUCCESS)
- printk(KERN_DEBUG "%s: AP denied association (code=%d)\n",
- sdata->name, status_code);
+ printk(KERN_DEBUG "%s: %pM denied association (code=%d)\n",
+ sdata->name, mgmt->sa, status_code);
else
printk(KERN_DEBUG "%s: associated\n", sdata->name);
prev parent reply other threads:[~2009-12-02 11:50 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-02 11:43 [PATCH 0/6] mac80211: mlme work improvements Johannes Berg
2009-12-02 11:43 ` [PATCH 1/6] cfg80211: avoid sending spurious deauth to userspace Johannes Berg
2009-12-02 11:43 ` [PATCH 2/6] mac80211: dont try to use existing sta for AP Johannes Berg
2009-12-02 11:43 ` [PATCH 3/6] mac80211: let cfg80211 manage auth state Johannes Berg
2009-12-02 11:43 ` [PATCH 4/6] mac80211: generalise management work a bit Johannes Berg
2009-12-02 11:43 ` [PATCH 5/6] mac80211: generalise work handling Johannes Berg
2009-12-07 14:53 ` [PATCH 5/6 v2] " Johannes Berg
2009-12-02 11:43 ` Johannes Berg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20091202114647.401535512@sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).