mac80211: pass scratch buffer directly, remove additional pointers

Recalculate the offset pointers in the ccmp calculations rather than
in the callers.

Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

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

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

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