[OpenWrt-Devel] [PATCH 7/7] mac80211: rename iwlagn to iwlwifi

[John Crispin]

On 23/08/2015 13:00, Dirk Neukirchen wrote:
> follow upstream module rename
> commit 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33
> 
> Signed-off-by: Dirk Neukirchen <dirkneukirchen at web.de>

this one does not apply either. can you resend all 3 in a new series please

	John

> ---
>  package/kernel/mac80211/Makefile | 20 ++++++++++----------
>  1 file changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
> index 061f117..cb38ab0 100644
> --- a/package/kernel/mac80211/Makefile
> +++ b/package/kernel/mac80211/Makefile
> @@ -28,7 +28,7 @@ PKG_DRIVERS = \
>  	b43 b43legacy \
>  	carl9170 \
>  	hermes hermes-pci hermes-pcmcia hermes-plx \
> -	iwl-legacy iwl3945 iwl4965 iwlagn \
> +	iwl-legacy iwl3945 iwl4965 iwlwifi \
>  	libipw ipw2100 ipw2200 \
>  	libertas-usb libertas-sdio \
>  	lib80211 \
> @@ -904,7 +904,7 @@ define KernelPackage/ipw2200/description
>  endef
>  
>  
> -define KernelPackage/iwlagn
> +define KernelPackage/iwlwifi
>    $(call KernelPackage/mac80211/Default)
>    DEPENDS:= +kmod-mac80211 @PCI_SUPPORT + at DRIVER_11N_SUPPORT
>    TITLE:=Intel AGN Wireless support
> @@ -916,8 +916,8 @@ define KernelPackage/iwlagn
>    MENU:=1
>  endef
>  
> -define KernelPackage/iwlagn/description
> - iwlagn kernel module for
> +define KernelPackage/iwlwifi/description
> + iwlwifi kernel module for
>   Intel Wireless WiFi Link 6250AGN Adapter
>   Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
>   Intel WiFi Link 1000BGN
> @@ -935,11 +935,11 @@ define KernelPackage/iwlagn/description
>   Intel 3165 Wi-Fi Adapter
>  endef
>  
> -define KernelPackage/iwlagn/config
> -  if PACKAGE_kmod-iwlagn
> +define KernelPackage/iwlwifi/config
> +  if PACKAGE_kmod-iwlwifi
>  
>  	config PACKAGE_IWLWIFI_DEBUG
> -		bool "Enable full debugging output in the iwlagn driver"
> +		bool "Enable full debugging output in the iwlwif driver"
>  		default n
>  		help
>  		  This option will enable debug tracing output for the iwlwifi drivers
> @@ -1747,7 +1747,7 @@ config-$(call config_package,ipw2200) += IPW2200
>  config-$(call config_package,iwl-legacy) += IWLEGACY
>  config-$(call config_package,iwl3945) += IWL3945
>  config-$(call config_package,iwl4965) += IWL4965
> -config-$(call config_package,iwlagn) += IWLWIFI IWLDVM IWLMVM
> +config-$(call config_package,iwlwifi) += IWLWIFI IWLDVM IWLMVM
>  config-$(CONFIG_PACKAGE_IWLWIFI_DEBUG)+= IWLWIFI_DEBUG
>  config-$(CONFIG_PACKAGE_IWLWIFI_DEBUGFS)+= IWLWIFI_DEBUGFS
>  
> @@ -2001,7 +2001,7 @@ define KernelPackage/ipw2200/install
>  	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
>  endef
>  
> -define KernelPackage/iwlagn/install
> +define KernelPackage/iwlwifi/install
>  	$(INSTALL_DIR) $(1)/lib/firmware
>  ifneq ($(CONFIG_IWL100_FW),)
>  	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
> @@ -2205,7 +2205,7 @@ $(eval $(call KernelPackage,carl9170))
>  $(eval $(call KernelPackage,cfg80211))
>  $(eval $(call KernelPackage,iwl3945))
>  $(eval $(call KernelPackage,iwl4965))
> -$(eval $(call KernelPackage,iwlagn))
> +$(eval $(call KernelPackage,iwlwifi))
>  $(eval $(call KernelPackage,iwl-legacy))
>  $(eval $(call KernelPackage,lib80211))
>  $(eval $(call KernelPackage,libertas-sdio))
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel