[PATCH] mac80211: consolidate decryption

Currently, we run through all three crypto algorithms for each
received frame even though we have previously determined which
key we have and as such already know which algorithm will be
used. Change it to invoke only the needed function. Also move
the WEP decrypt handler to wep.c so that fewer functions need
to be non-static.

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

diff --cc net/mac80211/rx.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

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