Re: [OpenWrt-Devel] [PATCH 6/7] mac80211: cosmetic changes

2015-08-23 Thread Jonas Gorski
Hi,

On Sun, Aug 23, 2015 at 1:02 PM, Dirk Neukirchen dirkneukirc...@web.de wrote:

 - remove net prefix from some modules
 - try to sort alphabetically

 Signed-off-by: Dirk Neukirchen dirkneukirc...@web.de

please split this into two (first remove the net prefix, then reorder
them), this should make it a bit less unreadable.


regards
Jonas
___
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel


[OpenWrt-Devel] [PATCH 6/7] mac80211: cosmetic changes

2015-08-23 Thread Dirk Neukirchen

- remove net prefix from some modules
- try to sort alphabetically

Signed-off-by: Dirk Neukirchen dirkneukirc...@web.de
---
 package/kernel/mac80211/Makefile | 2494 +++---
 1 file changed, 1266 insertions(+), 1228 deletions(-)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index b9042db..061f117 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -23,15 +23,28 @@ PKG_BUILD_PARALLEL:=1
 PKG_MAINTAINER:=Felix Fietkau n...@openwrt.org
 
 PKG_DRIVERS = \
-   adm8211 ath5k libertas-usb libertas-sdio p54-common p54-pci p54-usb 
p54-spi \
-   rt2x00-lib rt2x00-pci rt2x00-usb rt2800-lib rt2400-pci rt2500-pci \
-   rt2500-usb rt61-pci rt73-usb rt2800-mmio rt2800-pci rt2800-usb 
rt2800-soc \
-   rtl8180 rtl8187 zd1211rw mac80211-hwsim carl9170 b43 b43legacy \
-   ath9k-common ath9k ath9k-htc ath10k ath net-libipw net-ipw2100 
net-ipw2200 \
-   mwl8k mwifiex-pcie net-hermes net-hermes-pci net-hermes-plx 
net-hermes-pcmcia \
-   iwl-legacy iwl3945 iwl4965 iwlagn wlcore wl12xx wl18xx lib80211 \
+   adm8211 \
+   ath ath5k ath9k ath9k-common ath9k-htc ath10k \
+   b43 b43legacy \
+   carl9170 \
+   hermes hermes-pci hermes-pcmcia hermes-plx \
+   iwl-legacy iwl3945 iwl4965 iwlagn \
+   libipw ipw2100 ipw2200 \
+   libertas-usb libertas-sdio \
+   lib80211 \
+   mac80211-hwsim \
+   mt7601u \
+   mwl8k mwifiex-pcie \
+   p54-common p54-pci p54-usb p54-spi \
+   rt2x00-lib rt2x00-pci rt2x00-usb \
+   rt2400-pci rt2500-pci rt2500-usb \
+   rt2800-lib rt2800-mmio rt2800-pci rt2800-usb rt2800-soc \
+   rt61-pci rt73-usb \
+   rtl8180 rtl8187 \
rtlwifi rtlwifi-pci rtlwifi-usb rtl8192c-common rtl8192ce rtl8192se \
-   rtl8192de rtl8192cu mt7601u
+   rtl8192de rtl8192cu \
+   wlcore wl12xx wl18xx \
+   zd1211rw
 
 PKG_CONFIG_DEPENDS:= \
CONFIG_PACKAGE_kmod-mac80211 \
@@ -126,513 +139,652 @@ define Download/linux-firmware
 endef
 $(eval $(call Download,linux-firmware))
 
-PKG_ATH10K_LINUX_FIRMWARE_NAME:=ath10k-firmware
-PKG_ATH10K_LINUX_FIRMWARE_VERSION:=b46f3e01a6c1f9150fb4612ef53611d714565842
-PKG_ATH10K_LINUX_FIRMWARE_SOURCE:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION).tar.bz2
-PKG_ATH10K_LINUX_FIRMWARE_PROTO:=git
-PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
-PKG_ATH10K_LINUX_FIRMWARE_SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_NAME)-$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
-#PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM:=?
 
-define Download/ath10k-firmware
-  FILE:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE)
-  URL:=$(PKG_ATH10K_LINUX_FIRMWARE_SOURCE_URL)
-  PROTO:=$(PKG_ATH10K_LINUX_FIRMWARE_PROTO)
-  VERSION:=$(PKG_ATH10K_LINUX_FIRMWARE_VERSION)
-  SUBDIR:=$(PKG_ATH10K_LINUX_FIRMWARE_SUBDIR)
-  #MIRROR_MD5SUM:=$(PKG_ATH10K_LINUX_FIRMWARE_MIRROR_MD5SUM)
+define KernelPackage/adm8211
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=ADMTek 8211 support
+  DEPENDS+=@PCI_SUPPORT +kmod-mac80211 +kmod-eeprom-93cx6
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/adm8211.ko
+  AUTOLOAD:=$(call AutoProbe,adm8211)
 endef
-$(eval $(call Download,ath10k-firmware))
 
-# Prism54 drivers
-P54PCIFW:=2.13.12.0.arm
-P54USBFW:=2.13.24.0.lm87.arm
-P54SPIFW:=2.13.0.0.a.13.14.arm
 
-define Download/p54usb
-  FILE:=$(P54USBFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb
-  MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6
-endef
-$(eval $(call Download,p54usb))
+define KernelPackage/ath/config
+  if PACKAGE_kmod-ath
+   config ATH_USER_REGD
+   bool Force Atheros drivers to respect the user's regdomain 
settings
+   help
+ Atheros' idea of regulatory handling is that the EEPROM of 
the card defines
+ the regulatory limits and the user is only allowed to 
restrict the settings
+ even further, even if the country allows frequencies or power 
levels that
+ are forbidden by the EEPROM settings.
 
-define Download/p54pci
-  FILE:=$(P54PCIFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac
-  MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4
-endef
-$(eval $(call Download,p54pci))
+ Select this option if you want the driver to respect the 
user's decision about
+ regulatory settings.
 
-define Download/p54spi
-  FILE:=$(P54SPIFW)
-  URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560
-  MD5SUM:=42661f8ecbadd88012807493f596081d
-endef
-$(eval $(call Download,p54spi))
+   config PACKAGE_ATH_DEBUG
+   bool Atheros wireless debugging
+   help
+ Say Y, if you want to debug atheros wireless drivers.
+ Only ath9k  ath10k make use of this.
 
-define KernelPackage/p54/Default
-  $(call KernelPackage/mac80211/Default)
-  TITLE:=Prism54 Drivers
-endef
+   config PACKAGE_ATH_DFS
+