mac80211: minor code cleanups

Nothing very interesting, some checkpatch inspired stuff,
some other things.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --cc net/mac80211/debugfs_sta.c
Simple merge

diff --cc net/mac80211/main.c
Simple merge

diff --cc net/mac80211/mesh.c
Simple merge

diff --cc net/mac80211/rc80211_pid.h
Simple merge

diff --cc net/mac80211/rx.c
Simple merge

diff --cc net/mac80211/sta_info.c
Simple merge

diff --cc net/mac80211/wep.c
Simple merge

diff --cc net/mac80211/wep.h
Simple merge

diff --cc net/mac80211/wpa.c
Simple merge