From: Bruno Randolf <br1@einfach.org>
Date: Fri, 17 Sep 2010 02:36:25 +0000 (+0900)
Subject: ath/ath5k/ath9k: Fix crypto capabilities merge issue
X-Git-Tag: v2.6.37-rc1~147^2~373^2^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce2220d1da0bad9583af38a03ad508968d554c0f;p=pandora-kernel.git

ath/ath5k/ath9k: Fix crypto capabilities merge issue

Fixing up a merge issue / concurrent development:

Remove unneeded ath_crypt_caps flags, as per "ath9k_hw: remove useless hw
capability flags" (364734fafbba0c3133e482db78149b9a823ae7a5), but set the
AESCCM flag for ath9k. common ath code still needs a flag for this because
there is ath5k hardware which can't do AES in hardware.

Signed-off-by: Bruno Randolf <br1@einfach.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed