From 4b2cf1393ab450fc70b17dc4331b2443336537bc Mon Sep 17 00:00:00 2001 From: kelmo Date: Wed, 4 Jun 2008 12:25:31 +0000 Subject: [PATCH] Remove modules.order files in Makefile clean targets. Remove kbuild by-products in regression/Makefile. Also allow regression/tkip/test_tkip.c to compile (too few arguments to function ieee80211_crypto_demic). Closes: #1973 git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3699 0192ed92-7a03-0410-a25b-9323aeb14dbd --- Makefile | 2 +- ath/Makefile | 2 +- ath_hal/Makefile | 2 +- ath_rate/Makefile | 2 ++ ath_rate/amrr/Makefile | 2 +- ath_rate/minstrel/Makefile | 2 +- ath_rate/onoe/Makefile | 2 +- ath_rate/sample/Makefile | 2 +- net80211/Makefile | 2 +- regression/Makefile | 3 +++ regression/ccmp/Makefile | 2 +- regression/tkip/Makefile | 2 +- regression/tkip/test_tkip.c | 2 +- regression/wep/Makefile | 2 +- 14 files changed, 17 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index 4d263ee..6b5f1c8 100644 --- a/Makefile +++ b/Makefile @@ -129,7 +129,7 @@ clean: done -$(MAKE) -C $(TOOLS) clean rm -rf .tmp_versions - rm -f *.symvers svnversion.h + rm -f modules.order *.symvers svnversion.h .PHONY: info info: diff --git a/ath/Makefile b/ath/Makefile index b736ad0..ca0cc88 100644 --- a/ath/Makefile +++ b/ath/Makefile @@ -77,7 +77,7 @@ install: .PHONY: clean clean: rm -f *~ *.o *.ko *.mod.c .*.cmd - rm -f .depend .version .*.o.flags .*.o.d + rm -f modules.order .depend .version .*.o.flags .*.o.d rm -rf .tmp_versions ath_$(BUSNAME).o: $(ath_$(BUSNAME)-objs) diff --git a/ath_hal/Makefile b/ath_hal/Makefile index b914aa0..800d914 100644 --- a/ath_hal/Makefile +++ b/ath_hal/Makefile @@ -102,7 +102,7 @@ endif .PHONY: clean clean: rm -f *~ *.o *.ko *.mod.c uudecode .*.cmd - rm -f .depend .version .*.o.flags .*.o.d + rm -f modules.order .depend .version .*.o.flags .*.o.d rm -rf .tmp_versions ath_hal.o: $(addprefix $(obj)/,$(ath_hal-objs)) diff --git a/ath_rate/Makefile b/ath_rate/Makefile index d62323f..c792203 100644 --- a/ath_rate/Makefile +++ b/ath_rate/Makefile @@ -26,3 +26,5 @@ clean: for i in $(obj-y); do \ $(MAKE) -C $$i clean; \ done + + rm -f modules.order diff --git a/ath_rate/amrr/Makefile b/ath_rate/amrr/Makefile index 8667b5f..dff286d 100644 --- a/ath_rate/amrr/Makefile +++ b/ath_rate/amrr/Makefile @@ -66,7 +66,7 @@ install: .PHONY: clean clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_rate_amrr.o: $(ath_rate_amrr-objs) diff --git a/ath_rate/minstrel/Makefile b/ath_rate/minstrel/Makefile index 7d13705..255be85 100644 --- a/ath_rate/minstrel/Makefile +++ b/ath_rate/minstrel/Makefile @@ -64,7 +64,7 @@ install: .PHONY: clean clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_rate_minstrel.o: $(ath_rate_minstrel-objs) diff --git a/ath_rate/onoe/Makefile b/ath_rate/onoe/Makefile index f5e6752..17a6a0d 100644 --- a/ath_rate/onoe/Makefile +++ b/ath_rate/onoe/Makefile @@ -66,7 +66,7 @@ install: .PHONY: clean clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_rate_onoe.o: $(ath_rate_onoe-objs) diff --git a/ath_rate/sample/Makefile b/ath_rate/sample/Makefile index 3b19f8e..0795d39 100644 --- a/ath_rate/sample/Makefile +++ b/ath_rate/sample/Makefile @@ -64,7 +64,7 @@ install: .PHONY: clean clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_rate_sample.o: $(ath_rate_sample-objs) diff --git a/net80211/Makefile b/net80211/Makefile index efdd84a..245a3b4 100644 --- a/net80211/Makefile +++ b/net80211/Makefile @@ -114,5 +114,5 @@ install: .PHONY: clean clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions diff --git a/regression/Makefile b/regression/Makefile index 1ebb19a..661ed6e 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -23,3 +23,6 @@ clean: for i in $(obj-y); do \ $(MAKE) -C $$i clean; \ done + + rm -f modules.order *.symvers + rm -rf .tmp_versions diff --git a/regression/ccmp/Makefile b/regression/ccmp/Makefile index a1b9dff..930c820 100644 --- a/regression/ccmp/Makefile +++ b/regression/ccmp/Makefile @@ -24,7 +24,7 @@ install: clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_test_ccmp.o: $(ath_test_ccmp-objs) diff --git a/regression/tkip/Makefile b/regression/tkip/Makefile index 3320812..67d6a20 100644 --- a/regression/tkip/Makefile +++ b/regression/tkip/Makefile @@ -24,7 +24,7 @@ install: clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_test_tkip.o: $(ath_test_tkip-objs) diff --git a/regression/tkip/test_tkip.c b/regression/tkip/test_tkip.c index d28e01f..86b9535 100644 --- a/regression/tkip/test_tkip.c +++ b/regression/tkip/test_tkip.c @@ -329,7 +329,7 @@ runtest(struct ieee80211vap *vap, struct ciphertest *t) /* * De-MIC decrypted frame. */ - if (!ieee80211_crypto_demic(vap, key, skb, hdrlen)) { + if (!ieee80211_crypto_demic(vap, key, skb, hdrlen, 0)) { printk("FAIL: tkip demic failed\n"); goto bad; } diff --git a/regression/wep/Makefile b/regression/wep/Makefile index 11271b1..9db5c74 100644 --- a/regression/wep/Makefile +++ b/regression/wep/Makefile @@ -24,7 +24,7 @@ install: clean: -rm -f *~ *.o *.ko *.mod.c - -rm -f .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd + -rm -f modules.order .depend .version .*.o.flags .*.o.d .*.o.cmd .*.ko.cmd -rm -rf .tmp_versions ath_test_wep.o: $(ath_test_wep-objs) -- 2.35.1