Applied both patches to 'ieee80211-wifi' branch.
Your patch format was just fine, too. "applymbox" (in git/tools)
slurped your patches correctly.
NOTE: I don't want to push the updated branch to kernel.org just yet,
in case Linus pulls [because we don't want to surprise him with
unexpected
Let's start with the easy part: resolve conflicts and start using
net/ieee80211*.h. Replace crypto with the version from
net/ieee80211. The latter patch removes
drivers/net/wireless/hostap/hostap_crypt*. Hopefully the patch is in
format that is easy to apply. If everything goes well, quilt with a
s
