[ar7] let 802.1q tagged frames go in and out from cpmac (#6730)

[openwrt.git] / package / hostapd / Makefile

diff --git a/package/hostapd/Makefile b/package/hostapd/Makefile
index 3aec903..e6e2313 100644 (file)
--- a/package/hostapd/Makefile
+++ b/package/hostapd/Makefile
@@ -65,9 +65,9 @@ endif
 ifneq ($(LOCAL_TYPE),hostapd)
   ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
     TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK
 ifneq ($(LOCAL_TYPE),hostapd)
   ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
     TARGET_CFLAGS += -DNO_TIMESTAMP_CHECK

-    DRIVER_MAKEOPTS += \
-               CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)

   endif
   endif

+  DRIVER_MAKEOPTS += \
+       CONFIG_DRIVER_ROBOSWITCH=$(CONFIG_PACKAGE_kmod-switch)

 endif
 
 define Package/hostapd/Default
 endif
 
 define Package/hostapd/Default


@@ -75,7 +75,8 @@ define Package/hostapd/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator
   URL:=http://hostap.epitest.fi/

-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

 endef
 
 define Package/hostapd
 endef
 
 define Package/hostapd


@@ -115,7 +116,8 @@ define Package/wpad/Default
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   URL:=http://hostap.epitest.fi/
   CATEGORY:=Network
   TITLE:=IEEE 802.1x Authenticator/Supplicant
   URL:=http://hostap.epitest.fi/

-  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny
+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda
+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

 endef
 
 define Package/wpad
 endef
 
 define Package/wpad


@@ -144,7 +146,9 @@ define Package/wpa-supplicant
   CATEGORY:=Network
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/
   CATEGORY:=Network
   TITLE:=WPA Supplicant
   URL:=http://hostap.epitest.fi/wpa_supplicant/

+  DEPENDS:=@!TARGET_avr32 @!TARGET_etrax +PACKAGE_kmod-mac80211:libnl-tiny +PACKAGE_kmod-mac80211:crda

   VARIANT:=supplicant-full
   VARIANT:=supplicant-full

+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

 endef
 
 define Package/wpa-supplicant/Description
 endef
 
 define Package/wpa-supplicant/Description


@@ -171,6 +175,7 @@ define Package/wpa-cli
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface
   CATEGORY:=Network
   DEPENDS:=wpa-supplicant
   TITLE:=WPA Supplicant command line interface

+  MAINTAINER:=Felix Fietkau <nbd@openwrt.org>

 endef
 
 define Package/wpa-cli/Description
 endef
 
 define Package/wpa-cli/Description


@@ -219,7 +224,8 @@ endef
 define Build/Compile/wpad
        echo ` \
                $(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \
 define Build/Compile/wpad
        echo ` \
                $(call Build/RunMake,hostapd,-s MULTICALL=1 dump_cflags); \

-               $(call Build/RunMake,wpa_supplicant,-s dump_cflags) | sed -e 's,$(TARGET_CFLAGS),,' \
+               $(call Build/RunMake,wpa_supplicant,-s dump_cflags) | \
+               sed -e 's,-n ,,g' -e 's,$(TARGET_CFLAGS),,' \

        ` > $(PKG_BUILD_DIR)/.cflags
        $(call Build/RunMake,hostapd, \
                CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \
        ` > $(PKG_BUILD_DIR)/.cflags
        $(call Build/RunMake,hostapd, \
                CFLAGS="$$$$(cat $(PKG_BUILD_DIR)/.cflags)" \