diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-12-13 15:20:45 -0500 |
| commit | 1d212aa96e1b63459486f729af9a3fa38768b801 (patch) | |
| tree | e91e74db57a5bb7884b4681cdb788d405ec8f10f /net/mac80211/work.c | |
| parent | 8c4877a4128e7931077b024a891a4b284d8756a3 (diff) | |
| parent | b7613370db5ba66ad81e41cd3a5417fde4d5e03c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net/mac80211/work.c')
| -rw-r--r-- | net/mac80211/work.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/mac80211/work.c b/net/mac80211/work.c index 2b5c3f267198..de43753076d2 100644 --- a/net/mac80211/work.c +++ b/net/mac80211/work.c | |||
| @@ -458,8 +458,9 @@ ieee80211_direct_probe(struct ieee80211_work *wk) | |||
| 458 | return WORK_ACT_TIMEOUT; | 458 | return WORK_ACT_TIMEOUT; |
| 459 | } | 459 | } |
| 460 | 460 | ||
| 461 | printk(KERN_DEBUG "%s: direct probe to %pM (try %d)\n", | 461 | printk(KERN_DEBUG "%s: direct probe to %pM (try %d/%i)\n", |
| 462 | sdata->name, wk->filter_ta, wk->probe_auth.tries); | 462 | sdata->name, wk->filter_ta, wk->probe_auth.tries, |
| 463 | IEEE80211_AUTH_MAX_TRIES); | ||
| 463 | 464 | ||
| 464 | /* | 465 | /* |
| 465 | * Direct probe is sent to broadcast address as some APs | 466 | * Direct probe is sent to broadcast address as some APs |