summary refs log tree commit diff
path: root/net/mac80211/Makefile
diff options
context:
space:
mode:
authorXiang Gao <qasdfgtyuiop@gmail.com>2017-10-10 22:31:49 -0400
committerJohannes Berg <johannes.berg@intel.com>2017-10-11 09:37:35 +0200
commit4133da73067af0417c623eb4ad5e85081ccbf4b4 (patch)
tree86ca2fa1fd06c84662778f34b8de6d01e3c9ede4 /net/mac80211/Makefile
parent8c03145a2e2d98d44dba4bf16ab34636eb60b834 (diff)
downloadlinux-4133da73067af0417c623eb4ad5e85081ccbf4b4.tar.gz
mac80211: aead api to reduce redundancy
Currently, the aes_ccm.c and aes_gcm.c are almost line by line copy of
each other. This patch reduce code redundancy by moving the code in these
two files to crypto/aead_api.c to make it a higher level aead api. The
file aes_ccm.c and aes_gcm.c are removed and all the functions there are
now implemented in their headers using the newly added aead api.

Signed-off-by: Xiang Gao <qasdfgtyuiop@gmail.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/Makefile')
-rw-r--r--net/mac80211/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 282912245938..80f25ff2f24b 100644
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -6,6 +6,7 @@ mac80211-y := \
 	driver-ops.o \
 	sta_info.o \
 	wep.o \
+	aead_api.o \
 	wpa.o \
 	scan.o offchannel.o \
 	ht.o agg-tx.o agg-rx.o \
@@ -15,8 +16,6 @@ mac80211-y := \
 	rate.o \
 	michael.o \
 	tkip.o \
-	aes_ccm.o \
-	aes_gcm.o \
 	aes_cmac.o \
 	aes_gmac.o \
 	fils_aead.o \