diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-11-06 02:58:09 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-11-06 02:58:09 -0500 |
| commit | 78eb77a9cc3af73e3cd86a197b7c1f28fd840978 (patch) | |
| tree | 2cf5fb9935412e1a0fae2b25718aa84fc2e8412d /net | |
| parent | a81c52a81d6dbe6a36bce18112da04f20b175192 (diff) | |
| parent | df6d7c94b0c3ae6a1185c9e5fa8ee3368e4a5efb (diff) | |
| download | linux-3.10-78eb77a9cc3af73e3cd86a197b7c1f28fd840978.tar.gz linux-3.10-78eb77a9cc3af73e3cd86a197b7c1f28fd840978.tar.bz2 linux-3.10-78eb77a9cc3af73e3cd86a197b7c1f28fd840978.zip | |
Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/ieee80211_rx.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 770704183a1..2759312a420 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c @@ -1078,12 +1078,12 @@ static int ieee80211_parse_info_param(struct ieee80211_info_element while (length >= sizeof(*info_element)) { if (sizeof(*info_element) + info_element->len > length) { - IEEE80211_ERROR("Info elem: parse failed: " - "info_element->len + 2 > left : " - "info_element->len+2=%zd left=%d, id=%d.\n", - info_element->len + - sizeof(*info_element), - length, info_element->id); + IEEE80211_DEBUG_MGMT("Info elem: parse failed: " + "info_element->len + 2 > left : " + "info_element->len+2=%zd left=%d, id=%d.\n", + info_element->len + + sizeof(*info_element), + length, info_element->id); /* We stop processing but don't return an error here * because some misbehaviour APs break this rule. ie. * Orinoco AP1000. */ |