[package] mac80211: allow NOHT for IBSS mode

[openwrt.git] / package / mac80211 / Makefile

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index c56db34..d2f568f 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -10,10 +10,10 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mac80211
 
 
 PKG_NAME:=mac80211
 

-PKG_VERSION:=2012-02-06
-PKG_RELEASE:=4
+PKG_VERSION:=2012-02-27
+PKG_RELEASE:=1

 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
 PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources

-PKG_MD5SUM:=fae71c35ee3f3de6329f2db7aed6d265
+PKG_MD5SUM:=ccd51c46813c25090ce657c8b7c67615

 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)


@@ -888,12 +888,12 @@ define KernelPackage/b43/config
 
        choice
                prompt "b43 firmware version"
 
        choice
                prompt "b43 firmware version"

-               default B43_FW_5_10
+               default B43_FW_5_100_138

                help
                  This option allows you to select the version of the b43 firmware.
 
        config B43_FW_4_150
                help
                  This option allows you to select the version of the b43 firmware.
 
        config B43_FW_4_150

-               bool "Firmware 410.2160 from driver 4.150.10.5 (stable)"
+               bool "Firmware 410.2160 from driver 4.150.10.5 (old stable)"

                help
                  Stable firmware for BCM43xx devices.
 
                help
                  Stable firmware for BCM43xx devices.
 


@@ -918,7 +918,7 @@ define KernelPackage/b43/config
                  If unsure, select the "stable" firmware.
    
        config B43_FW_5_100_138
                  If unsure, select the "stable" firmware.
    
        config B43_FW_5_100_138

-               bool "Firmware 666.2 from driver 5.100.138"
+               bool "Firmware 666.2 from driver 5.100.138 (stable)"

                help
                  Newer experimental firmware for BCM43xx devices.
 
                help
                  Newer experimental firmware for BCM43xx devices.
 


@@ -1003,7 +1003,6 @@ define KernelPackage/b43/config
 
        config PACKAGE_B43_PHY_N
                bool "Enable support for N-PHYs"
 
        config PACKAGE_B43_PHY_N
                bool "Enable support for N-PHYs"

-               select B43_FW_5_100_138

                default y
                help
                  Enable support for BCM4321 and BCM4322.
                default y
                help
                  Enable support for BCM4321 and BCM4322.


@@ -1014,7 +1013,6 @@ define KernelPackage/b43/config
 
        config PACKAGE_B43_PHY_HT
                bool "Enable support for HT-PHYs"
 
        config PACKAGE_B43_PHY_HT
                bool "Enable support for HT-PHYs"

-               select B43_FW_5_100_138

                default n
                help
                  Currently broken.
                default n
                help
                  Currently broken.


@@ -1024,7 +1022,6 @@ define KernelPackage/b43/config
        config PACKAGE_B43_PHY_LCN
                bool "Enable support for LCN-PHYs"
                depends on BROKEN
        config PACKAGE_B43_PHY_LCN
                bool "Enable support for LCN-PHYs"
                depends on BROKEN

-               select B43_FW_5_100_138

                default n
                help
                  Currently broken.
                default n
                help
                  Currently broken.


@@ -1300,13 +1297,15 @@ define Build/Prepare
        $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE)
        rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
        rm -rf $(PKG_BUILD_DIR)/include/linux/bcma
        $(TAR) -C $(PKG_BUILD_DIR) -xjf $(DL_DIR)/$(PKG_LINUX_FIRMWARE_SOURCE)
        rm -rf $(PKG_BUILD_DIR)/include/linux/ssb
        rm -rf $(PKG_BUILD_DIR)/include/linux/bcma

+       rm -f $(PKG_BUILD_DIR)/include/linux/eeprom_93cx6.h

        rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h
        rm -f $(PKG_BUILD_DIR)/include/net/ieee80211.h

+       echo 'compat-wireless-$(PKG_VERSION)-$(PKG_RELEASE)-$(REVISION)' > $(PKG_BUILD_DIR)/compat_version

 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
  define Build/Compile/kmod
        rm -rf $(PKG_BUILD_DIR)/modules
 endef
 
 ifneq ($(CONFIG_PACKAGE_kmod-cfg80211)$(CONFIG_PACKAGE_kmod-lib80211),)
  define Build/Compile/kmod
        rm -rf $(PKG_BUILD_DIR)/modules

-       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) all
+       $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" $(MAKE_OPTS) modules

  endef
 endif
 
  endef
 endif