Ignore:
Timestamp:
2011-11-20T13:04:29+01:00 (5 years ago)
Author:
nbd
Message:

mac80211: update to 2011-11-15 from trunk

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/Makefile

    r28485 r29275  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2011-09-14 
     13PKG_VERSION:=2011-11-15 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 PKG_MD5SUM:=a5627e6079e8d0f0baf7045141503a3d 
     16PKG_MD5SUM:=0bb667c7fecbc244840d806df0604661 
    1717 
    1818PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    413413  TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc) 
    414414  URL:=http://linuxwireless.org/en/users/Drivers/ath9k 
    415   DEPENDS+= @PCI_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT 
     415  DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT 
    416416  FILES:= \ 
    417417        $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \ 
     
    453453  $(call KernelPackage/mac80211/Default) 
    454454  TITLE:=Driver for Atheros AR9170 USB sticks 
    455   DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +@DRIVER_11N_SUPPORT 
     455  DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core +kmod-input-core +@DRIVER_11N_SUPPORT 
    456456  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko 
    457457  AUTOLOAD:=$(call AutoLoad,60,carl9170) 
     
    490490define KernelPackage/libertas-usb 
    491491  $(call KernelPackage/mac80211/Default) 
    492   DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211 
     492  DEPENDS+= @USB_SUPPORT +kmod-cfg80211 +kmod-usb-core +kmod-lib80211 +@DRIVER_WEXT_SUPPORT 
    493493  TITLE:=Marvell 88W8015 Wireless Driver 
    494494  FILES:= \ 
     
    500500define KernelPackage/libertas-sd 
    501501  $(call KernelPackage/mac80211/Default) 
    502   DEPENDS+= +kmod-mac80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!LINUX_2_6_30 
     502  DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT 
    503503  TITLE:=Marvell 88W8686 Wireless Driver 
    504504  FILES:= \ 
     
    519519  $(call KernelPackage/mac80211/Default) 
    520520  TITLE:=libipw for ipw2100 and ipw2200 
    521   DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 
     521  DEPENDS:=@PCI_SUPPORT +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT 
    522522  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ipw2x00/libipw.ko 
    523523  AUTOLOAD:=$(call AutoLoad,49,libipw) 
     
    592592  $(call KernelPackage/mac80211/Default) 
    593593  TITLE:=Intersil Prism 2.5 PCI support 
    594   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     594  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes 
    595595  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko 
    596596  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) 
     
    604604  $(call KernelPackage/mac80211/Default) 
    605605  TITLE:=PLX9052 based PCI adaptor 
    606   DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     606  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes 
    607607  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko 
    608608  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) 
     
    616616  $(call KernelPackage/mac80211/Default) 
    617617  TITLE:=Hermes based PCMCIA adaptors 
    618   DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes +kmod-cfg80211 @BROKEN 
     618  DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes @BROKEN 
    619619  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko 
    620620  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) 
     
    629629  DEPENDS:= +kmod-mac80211 @PCI_SUPPORT 
    630630  TITLE:=Intel AGN Wireless support 
    631   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlagn.$(LINUX_KMOD_SUFFIX) 
     631  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlwifi/iwlwifi.ko 
    632632  AUTOLOAD:=$(call AutoLoad,60,iwlagn) 
    633633  MENU:=1 
     
    705705  DEPENDS:= +kmod-mac80211 @PCI_SUPPORT 
    706706  TITLE:=Intel legacy Wireless support 
    707   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl-legacy.$(LINUX_KMOD_SUFFIX) 
     707  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl-legacy.ko 
    708708  AUTOLOAD:=$(call AutoLoad,60,iwl-legacy) 
    709709endef 
     
    717717  DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy 
    718718  TITLE:=Intel iwl3945 Wireless support 
    719   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.$(LINUX_KMOD_SUFFIX) 
     719  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl3945.ko 
    720720  AUTOLOAD:=$(call AutoLoad,61,iwl3945) 
    721721endef 
     
    729729  DEPENDS:= +kmod-mac80211 +kmod-iwl-legacy 
    730730  TITLE:=Intel iwl4965 Wireless support 
    731   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.$(LINUX_KMOD_SUFFIX) 
     731  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/iwlegacy/iwl4965.ko 
    732732  AUTOLOAD:=$(call AutoLoad,61,iwl4965) 
    733733endef 
     
    10601060        EXTRA_CFLAGS="$(BUILDFLAGS)" \ 
    10611061        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ 
     1062        CONFIG_CFG80211=$(if $(CONFIG_PACKAGE_kmod-cfg80211),m) \ 
    10621063        CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ 
    10631064        CONFIG_MAC80211_RC_MINSTREL=y \ 
     
    11201121        CONFIG_RT2800PCI=$(if $(CONFIG_PACKAGE_kmod-rt2800-pci),m) \ 
    11211122        CONFIG_RT2800USB=$(if $(CONFIG_PACKAGE_kmod-rt2800-usb),m) \ 
     1123        CONFIG_RT2800USB_RT53XX=$(if $(CONFIG_PACKAGE_kmod-rt2800-usb),y) \ 
    11221124        CONFIG_RTL8180=$(if $(CONFIG_PACKAGE_kmod-rtl8180),m) \ 
    11231125        CONFIG_RTL8187=$(if $(CONFIG_PACKAGE_kmod-rtl8187),m) \ 
     
    11401142        CONFIG_LIB80211_CRYPT_CCMP=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ 
    11411143        CONFIG_LIB80211_CRYPT_TKIP=$(if $(CONFIG_PACKAGE_kmod-lib80211),m) \ 
    1142         CONFIG_IWLAGN=$(if $(CONFIG_PACKAGE_kmod-iwlagn),m) \ 
     1144        CONFIG_IWLWIFI=$(if $(CONFIG_PACKAGE_kmod-iwlagn),m) \ 
    11431145        CONFIG_IWLWIFI_LEGACY=$(if $(CONFIG_PACKAGE_kmod-iwl-legacy),m) \ 
    11441146        CONFIG_COMPAT_IWL4965=$(if $(CONFIG_PACKAGE_kmod-iwl4965),m) \ 
     
    11751177        CONFIG_ATL1E= \ 
    11761178        CONFIG_ATL1C= \ 
     1179        CONFIG_BRCMFMAC= \ 
     1180        CONFIG_BRCMUMAC= \ 
     1181        CONFIG_BRCMSMAC= \ 
    11771182        KLIB_BUILD="$(LINUX_DIR)" \ 
    11781183        MODPROBE=: \ 
     
    11981203endef 
    11991204 
    1200 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211),) 
     1205ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),) 
    12011206 define Build/Compile/kmod 
    12021207        rm -rf $(PKG_BUILD_DIR)/modules 
Note: See TracChangeset for help on using the changeset viewer.