From: Alexandros Couloumbis <alex@ozo.com>
Date: Sun, 1 Nov 2020 20:24:58 +0000 (+0200)
Subject: package/kernel/madwifi: fix kernel modules loading
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=fd4156353db293fd6d244938bc8e400d10c57537;p=openwrt%2F.git

package/kernel/madwifi: fix kernel modules loading
---

diff --git a/package/kernel/madwifi/Makefile b/package/kernel/madwifi/Makefile
index d0dabe41fd..a79c03ae3c 100644
--- a/package/kernel/madwifi/Makefile
+++ b/package/kernel/madwifi/Makefile
@@ -128,11 +128,11 @@ ifneq ($(CONFIG_MADWIFI_SINGLE_MODULE),)
   MADWIFI_AUTOLOAD:= ath_hal
 else
   MADWIFI_AUTOLOAD:= \
+	ath_hal \
 	wlan \
+	ath_rate_$(RATE_CONTROL) \
 	wlan_scan_ap \
 	wlan_scan_sta \
-	ath_hal \
-	ath_rate_$(RATE_CONTROL) \
 	wlan_acl 
 endif
 
diff --git a/package/kernel/madwifi/patches/999-nuke_crypt.patch b/package/kernel/madwifi/patches/999-nuke_crypt.patch
index 5862c745df..4bc2962ca1 100644
--- a/package/kernel/madwifi/patches/999-nuke_crypt.patch
+++ b/package/kernel/madwifi/patches/999-nuke_crypt.patch
@@ -15,7 +15,7 @@ index af6715a..a97d669 100644
  
  EXTRA_CFLAGS += -DSINGLE_MODULE -DRC_INIT="$(RC_INIT)" -DRC_EXIT="$(RC_EXIT)" -DRC_DECLARE="$(RC_DECLARE)"
 diff --git a/net80211/Makefile b/net80211/Makefile
-index 2564c64..8ba891a 100644
+index 2564c64..d0f9442 100644
 --- a/net80211/Makefile
 +++ b/net80211/Makefile
 @@ -49,7 +49,7 @@ ifeq ($(SINGLE_MODULE),)
@@ -55,14 +55,7 @@ index 2564c64..8ba891a 100644
  wlan_acl.o:	$(wlan_acl-objs)
  	$(LD) $(LDOPTS) -o wlan_acl.$(KMODSUF) -r $(wlan_acl-objs)
  
-@@ -97,16 +89,12 @@ endif
- 
- wlan-objs	:= if_media.o \
- 		   ieee80211_skb.o \
--		   ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
--		   ieee80211_crypto_none.o ieee80211_input.o ieee80211_node.o \
-+		   ieee80211.o ieee80211_beacon.o \
-+		   ieee80211_input.o ieee80211_node.o \
+@@ -102,11 +94,7 @@ wlan-objs	:= if_media.o \
  		   ieee80211_output.o ieee80211_power.o ieee80211_proto.o \
  		   ieee80211_scan.o ieee80211_wireless.o ieee80211_linux.o \
  		   ieee80211_monitor.o ieee80211_rate.o
@@ -75,10 +68,10 @@ index 2564c64..8ba891a 100644
  wlan_scan_ap-objs := ieee80211_scan_ap.o
  
 diff --git a/net80211/Makefile.kernel b/net80211/Makefile.kernel
-index b19a158..56d332a 100644
+index b19a158..8db1657 100644
 --- a/net80211/Makefile.kernel
 +++ b/net80211/Makefile.kernel
-@@ -23,40 +23,35 @@ EXTRA_CFLAGS += $(INCS) $(COPTS) -DOPT_AH_H=\"public/$(TARGET).opt_ah.h\"
+@@ -23,14 +23,14 @@ EXTRA_CFLAGS += $(INCS) $(COPTS) -DOPT_AH_H=\"public/$(TARGET).opt_ah.h\"
  # There is one authenticator mechanism: an in-kernel implementation
  # (wlan_xauth). 
  #
@@ -95,10 +88,7 @@ index b19a158..56d332a 100644
  		   $(MOD_AUTH) $(MOD_SCAN)
  
  wlan-objs	:= if_media.o \
--		   ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
--		   ieee80211_crypto_none.o ieee80211_input.o ieee80211_node.o \
-+		   ieee80211.o ieee80211_beacon.o \
-+		   ieee80211_input.o ieee80211_node.o \
+@@ -39,10 +39,6 @@ wlan-objs	:= if_media.o \
  		   ieee80211_output.o ieee80211_proto.o ieee80211_power.o \
  		   ieee80211_scan.o ieee80211_wireless.o ieee80211_linux.o \
  		   ieee80211_monitor.o ieee80211_rate.o ieee80211_skb.o
@@ -109,13 +99,8 @@ index b19a158..56d332a 100644
  wlan_acl-objs	:= ieee80211_acl.o
  wlan_scan_sta-objs := ieee80211_scan_sta.o
  wlan_scan_ap-objs  := ieee80211_scan_ap.o
- 
- ifeq ($(VERSION).$(PATCHLEVEL),2.4)
- export-objs	:= if_media.o \
--		   ieee80211.o ieee80211_beacon.o ieee80211_crypto.o \
--		   ieee80211_crypto_none.o ieee80211_input.o ieee80211_node.o \
-+		   ieee80211.o ieee80211_beacon.o \
-+		   ieee80211_input.o ieee80211_node.o \
+@@ -53,10 +49,9 @@ export-objs	:= if_media.o \
+ 		   ieee80211_crypto_none.o ieee80211_input.o ieee80211_node.o \
  		   ieee80211_output.o ieee80211_power.o ieee80211_proto.o \
  		   ieee80211_scan.o ieee80211_wireless.o ieee80211_linux.o \
 -		   ieee80211_crypto_wep.o ieee80211_crypto_tkip.o \