Skip to content

Commit

Permalink
Remove modules.order files in Makefile clean targets.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
kelmo committed Jun 4, 2008
1 parent eaac547 commit 4b2cf13
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion ath/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ath_hal/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 2 additions & 0 deletions ath_rate/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,3 +26,5 @@ clean:
for i in $(obj-y); do \
$(MAKE) -C $$i clean; \
done

rm -f modules.order
2 changes: 1 addition & 1 deletion ath_rate/amrr/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ath_rate/minstrel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ath_rate/onoe/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion ath_rate/sample/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion net80211/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions regression/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion regression/ccmp/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion regression/tkip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion regression/tkip/test_tkip.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion regression/wep/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 4b2cf13

Please sign in to comment.