mac80211: fix checkpatch errors

Fix a number of different checkpatch errors.

Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

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

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

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

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

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

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

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

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