]> git.karo-electronics.de Git - linux-beck.git/commit
projects / linux-beck.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c807666) | patch
ath/ath5k/ath9k: Fix crypto capabilities merge issue
authorBruno Randolf <br1@einfach.org>
Fri, 17 Sep 2010 02:36:25 +0000 (11:36 +0900)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 21 Sep 2010 15:05:05 +0000 (11:05 -0400)
commitce2220d1da0bad9583af38a03ad508968d554c0f
tree12cc09795665f59b8c0299fec37a30a3e9648a68tree | snapshot
parentc807666a08800ab387298817db5a6f6e11606adbcommit | diff
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>
drivers/net/wireless/ath/ath.h diff | blob | history
drivers/net/wireless/ath/ath5k/attach.c diff | blob | history
drivers/net/wireless/ath/ath9k/hw.c diff | blob | history
Beck SC1x5 Kernel