summaryrefslogtreecommitdiffstats
path: root/net/wireless/Makefile
diff options
context:
space:
mode:
authorJohn W. Linville2008-10-29 16:35:05 +0100
committerJohn W. Linville2008-11-21 17:08:17 +0100
commit274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d (patch)
tree04cd3f6a062496911b56737daa6a0858b769ccd6 /net/wireless/Makefile
parentorinoco: fix last beacon reporting on 64-bit systems (diff)
downloadkernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.tar.gz
kernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.tar.xz
kernel-qcow2-linux-274bfb8dc5ffa16cb073801bebe76ab7f4e2e73d.zip
lib80211: absorb crypto bits from net/ieee80211
These bits are shared already between ipw2x00 and hostap, and could probably be shared both more cleanly and with other drivers. This commit simply relocates the code to lib80211 and adjusts the drivers appropriately. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/Makefile')
-rw-r--r--net/wireless/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/wireless/Makefile b/net/wireless/Makefile
index d2d848d445f2..cc547edb111f 100644
--- a/net/wireless/Makefile
+++ b/net/wireless/Makefile
@@ -1,6 +1,9 @@
obj-$(CONFIG_WIRELESS_EXT) += wext.o
obj-$(CONFIG_CFG80211) += cfg80211.o
obj-$(CONFIG_LIB80211) += lib80211.o
+obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o
+obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o
+obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o
cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o
cfg80211-$(CONFIG_NL80211) += nl80211.o