mac80211: remove underscores from some key functions

Some key function don't exist without underscores, so
remove the underscores from those.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

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

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

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

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