ieee80211: fix misannotations

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --cc include/net/ieee80211.h
Simple merge

diff --cc net/ieee80211/ieee80211_crypt_tkip.c
Simple merge

diff --cc net/ieee80211/ieee80211_rx.c
Simple merge

diff --cc net/ieee80211/ieee80211_tx.c
Simple merge