madwifi: do not use turbo mode during ap mode autoselection unless specifically requested

[openwrt.git] / package / hostapd / Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index fcea017..38b14c7 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006-2008 OpenWrt.org
+# Copyright (C) 2006-2009 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostapd

-PKG_VERSION:=0.6.7
+PKG_VERSION:=0.6.9

 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/
 PKG_SOURCE_SUBDIR:=hostapd-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)

-PKG_MD5SUM:=0ce66cd5768235b5d2299f9efb9225d8
+PKG_MD5SUM:=83630d11fa66ade9091f1b304fccd74c

 PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi PACKAGE_kmod-mac80211:mac80211 PACKAGE_kmod-mac80211:libnl
 
 include $(INCLUDE_DIR)/package.mk
 PKG_BUILD_DEPENDS:=PACKAGE_kmod-madwifi:madwifi PACKAGE_kmod-mac80211:mac80211 PACKAGE_kmod-mac80211:libnl
 
 include $(INCLUDE_DIR)/package.mk


@@ -54,7 +54,7 @@ endef
 #endef
 
 define Package/hostapd/description
 #endef
 
 define Package/hostapd/description

- This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS 
+ This package contains a full featured IEEE 802.1x/WPA/EAP/RADIUS

  Authenticator.
 endef
 
  Authenticator.
 endef
 


@@ -68,7 +68,7 @@ endef
 #endef
 
 define Package/hostapd-mini/description
 #endef
 
 define Package/hostapd-mini/description

- This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator 
+ This package contains a minimal IEEE 802.1x/WPA/EAP/RADIUS Authenticator

  (WPA-PSK only).
 endef
 
  (WPA-PSK only).
 endef
 


@@ -79,7 +79,7 @@ define Package/hostapd-utils
 endef
 
 define Package/hostapd-utils/description
 endef
 
 define Package/hostapd-utils/description

- This package contains a command line utility to control the 
+ This package contains a command line utility to control the

  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 
  IEEE 802.1x/WPA/EAP/RADIUS Authenticator.
 endef
 


@@ -94,11 +94,11 @@ define Build/ConfigureTarget
 endef
 
 define Build/CompileTarget
 endef
 
 define Build/CompileTarget

-       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl -I$(STAGING_DIR)/usr/include" \
+       CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/madwifi -I$(STAGING_DIR)/usr/include/mac80211 -I$(STAGING_DIR)/usr/include/libnl $(TARGET_CPPFLAGS)" \

        $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
                $(TARGET_CONFIGURE_OPTS) \
                $(DRIVER_MAKEOPTS) \
        $(MAKE) -C $(PKG_BUILD_DIR)/hostapd.$(1)/hostapd \
                $(TARGET_CONFIGURE_OPTS) \
                $(DRIVER_MAKEOPTS) \

-               LIBS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib \
+               LIBS="$(TARGET_LDFLAGS) \

                        $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
                        $(if $(findstring default,$(1)),-lssl -lcrypto)" \
                hostapd hostapd_cli
                        $(if $(CONFIG_PACKAGE_kmod-mac80211),-lm $(STAGING_DIR)/usr/lib/libnl.a) \
                        $(if $(findstring default,$(1)),-lssl -lcrypto)" \
                hostapd hostapd_cli


@@ -112,7 +112,7 @@ define Package/InstallTemplate
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd $$(1)/usr/sbin/
 # config is managed through uci
 #      $(INSTALL_DIR) $$(1)/etc
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd $$(1)/usr/sbin/
 # config is managed through uci
 #      $(INSTALL_DIR) $$(1)/etc

-#      $(INSTALL_CONF) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd.conf $$(1)/etc/hostapd.conf 
+#      $(INSTALL_CONF) $(PKG_BUILD_DIR)/hostapd.$(2)/hostapd/hostapd.conf $$(1)/etc/hostapd.conf

 endef
 
 define Package/Template
 endef
 
 define Package/Template