diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 01:46:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-11-06 01:46:43 -0800 |
| commit | 64cb104e9d52f60cc18b9ed0d17edb34110a46b2 (patch) | |
| tree | b2c5a6c3a9942785720a77eac3ea6562ed636c2b /net/ieee80211/ieee80211_rx.c | |
| parent | 0c7bb31db0e35d4b772fac452b722460ca368acf (diff) | |
| parent | 78eb77a9cc3af73e3cd86a197b7c1f28fd840978 (diff) | |
| download | op-kernel-dev-64cb104e9d52f60cc18b9ed0d17edb34110a46b2.zip op-kernel-dev-64cb104e9d52f60cc18b9ed0d17edb34110a46b2.tar.gz | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6:
[PATCH] Kconfig: remove redundant NETDEVICES depends
[PATCH] ehea: 64K page support fix
[PATCH] ehea: Removed redundant define
[PATCH] ehea: Nullpointer dereferencation fix
[PATCH] bcm43xx: fix unexpected LED control values in BCM4303 sprom
[PATCH] bcm43xx: Fix low-traffic netdev watchdog TX timeouts
[PATCH] hostap_plx: fix CIS verification
[PATCH] ieee80211: don't flood log with errors
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
| -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 7707041..2759312 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. */ |
