diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2014-09-08 11:22:42 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2014-09-08 11:22:42 +0200 |
| commit | b1e9be8775b85d761cdb91386200a04d741f6a0d (patch) | |
| tree | 217f00534426fd5d8c8196a7ff61714ce4f1568a /net/mac80211 | |
| parent | c8d6591752e96c550cb98b781326d72d8eedcc79 (diff) | |
| download | linux-b1e9be8775b85d761cdb91386200a04d741f6a0d.tar.gz linux-b1e9be8775b85d761cdb91386200a04d741f6a0d.tar.bz2 linux-b1e9be8775b85d761cdb91386200a04d741f6a0d.zip | |
mac80211: annotate MMIC head/tailroom warning
This message occasionally triggers for some people as in
https://bugzilla.redhat.com/show_bug.cgi?id=1111740 but
it's not clear which (headroom or tailroom) is at fault.
Annotate the message a bit to get more information.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/wpa.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/net/mac80211/wpa.c b/net/mac80211/wpa.c index f7d4ca4c46e0..983527a4c1ab 100644 --- a/net/mac80211/wpa.c +++ b/net/mac80211/wpa.c @@ -64,8 +64,11 @@ ieee80211_tx_h_michael_mic_add(struct ieee80211_tx_data *tx) if (!info->control.hw_key) tail += IEEE80211_TKIP_ICV_LEN; - if (WARN_ON(skb_tailroom(skb) < tail || - skb_headroom(skb) < IEEE80211_TKIP_IV_LEN)) + if (WARN(skb_tailroom(skb) < tail || + skb_headroom(skb) < IEEE80211_TKIP_IV_LEN, + "mmic: not enough head/tail (%d/%d,%d/%d)\n", + skb_headroom(skb), IEEE80211_TKIP_IV_LEN, + skb_tailroom(skb), tail)) return TX_DROP; key = &tx->key->conf.key[NL80211_TKIP_DATA_OFFSET_TX_MIC_KEY]; |