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

diff --git a/Makefile b/Makefile
index 4d263ee014c3cd4325290b950519c35b5d79f7d4..6b5f1c80143ac5d60022e73a7a12444f5c8aea95 100644 (file)
--- 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 b736ad07c0ce28a4aaa183a72728094faae93a6e..ca0cc88aa16b0dd4b77a37741c6a01f188576adc 100644 (file)
--- 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 b914aa0796d323d092c7196d91d5288da9cd269a..800d9149bd169910418a76b99abdb14ff92ef2ab 100644 (file)
--- 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 d62323f5ef76ace91b6879beffd572f462fb708f..c792203a62ec043a522b2aae569cc01cb1e6063d 100644 (file)
--- 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 8667b5f3061038f6a3711d05fd838998f824c0b0..dff286df1ba035c2445566590031de29d718adcd 100644 (file)
--- 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 7d137057f368b7123b8068b70a9ff6f49b7d9557..255be8530545414eeed6181f8887bc2109205b71 100644 (file)
--- 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 f5e67522413e8e042bd639da4f94ae7a0290496c..17a6a0d6c31e5fbf26114ca9bd4241b7c9c9e76f 100644 (file)
--- 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 3b19f8e32efc953990c5d2284aa66f0002828037..0795d3929a92c8cc027aa3258bb18b5abd4b5d2d 100644 (file)
--- 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 efdd84a3fba503beee04884d7e2810a6eab79fa1..245a3b4f8985987a31029a995db24424c079b4ef 100644 (file)
--- 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 1ebb19a7f7f763e67d375bb2d602512652a0f27b..661ed6ee984867e0b3f5a814de293f9338bb54fe 100644 (file)
--- 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 a1b9dff83bfa7bfd9f839e07b2d2eb5834495913..930c820e0e26ad27293b8eb34362dcc77352b020 100644 (file)
--- 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 3320812e9bfe8fc30614b2887f1a879092a17f1f..67d6a20873179427e983ead0196a62d93596522b 100644 (file)
--- 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 d28e01f84c3f1bce7f89bb8aeef0a50231dacfe5..86b953553b3aaff5d6c8f78dcf60837443099f31 100644 (file)
--- 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 11271b11d29605742b967565dfe39ac253b8f8b2..9db5c74700f258640c993919b6c85e468bac5f7b 100644 (file)
--- 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)