From 17104f2b8f06714dd958f1277b7454f23ac23f82 Mon Sep 17 00:00:00 2001 From: Nicolas Thill Date: Sun, 23 Oct 2005 12:22:13 +0000 Subject: [PATCH] update wpa_supplicant to latest development release (v0.4.5), add drivers for hostap, madwifi and generic wext. SVN-Revision: 2275 --- openwrt/package/wpa_supplicant/Makefile | 6 +-- openwrt/package/wpa_supplicant/files/config | 3 ++ .../{ldflags.patch => 101-ldflags.patch} | 0 ...{opt_cflags.patch => 102-opt_cflags.patch} | 0 .../wpa_supplicant/patches/103-madwifi.patch | 50 +++++++++++++++++++ 5 files changed, 56 insertions(+), 3 deletions(-) rename openwrt/package/wpa_supplicant/patches/{ldflags.patch => 101-ldflags.patch} (100%) rename openwrt/package/wpa_supplicant/patches/{opt_cflags.patch => 102-opt_cflags.patch} (100%) create mode 100644 openwrt/package/wpa_supplicant/patches/103-madwifi.patch diff --git a/openwrt/package/wpa_supplicant/Makefile b/openwrt/package/wpa_supplicant/Makefile index 70792fe4ec..e7a10165c0 100644 --- a/openwrt/package/wpa_supplicant/Makefile +++ b/openwrt/package/wpa_supplicant/Makefile @@ -3,9 +3,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wpa_supplicant -PKG_VERSION:=0.3.9 +PKG_VERSION:=0.4.5 PKG_RELEASE:=1 -PKG_MD5SUM:=113873aafc4fcaa0515841a6f0a17fd0 +PKG_MD5SUM:=28347563119f09fc963bcdf9d16265a3 PKG_SOURCE_URL:=http://hostap.epitest.fi/releases/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -24,7 +24,7 @@ $(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.built: $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ - CPPFLAGS="-I$(TOPDIR)/package/openwrt/include -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \ + CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include -I$(STAGING_DIR)/usr/include/madwifi" \ LDFLAGS="-L$(STAGING_DIR)/usr/lib" \ OPT_FLAGS="$(TARGET_CFLAGS)" \ KERNEL=$(LINUX_DIR) \ diff --git a/openwrt/package/wpa_supplicant/files/config b/openwrt/package/wpa_supplicant/files/config index fe7d269da0..19a0fd3294 100644 --- a/openwrt/package/wpa_supplicant/files/config +++ b/openwrt/package/wpa_supplicant/files/config @@ -1,5 +1,8 @@ # rather important CONFIG_DRIVER_BROADCOM=y +CONFIG_DRIVER_HOSTAP=y +CONFIG_DRIVER_MADWIFI=y +CONFIG_DRIVER_WEXT=y CONFIG_IEEE8021X_EAPOL=y CONFIG_CTRL_IFACE=y diff --git a/openwrt/package/wpa_supplicant/patches/ldflags.patch b/openwrt/package/wpa_supplicant/patches/101-ldflags.patch similarity index 100% rename from openwrt/package/wpa_supplicant/patches/ldflags.patch rename to openwrt/package/wpa_supplicant/patches/101-ldflags.patch diff --git a/openwrt/package/wpa_supplicant/patches/opt_cflags.patch b/openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch similarity index 100% rename from openwrt/package/wpa_supplicant/patches/opt_cflags.patch rename to openwrt/package/wpa_supplicant/patches/102-opt_cflags.patch diff --git a/openwrt/package/wpa_supplicant/patches/103-madwifi.patch b/openwrt/package/wpa_supplicant/patches/103-madwifi.patch new file mode 100644 index 0000000000..3a3119f8a6 --- /dev/null +++ b/openwrt/package/wpa_supplicant/patches/103-madwifi.patch @@ -0,0 +1,50 @@ +diff -ruN wpa_supplicant-0.4.5-old/driver_madwifi.c wpa_supplicant-0.4.5-new/driver_madwifi.c +--- wpa_supplicant-0.4.5-old/driver_madwifi.c 2005-09-17 07:36:33.000000000 +0200 ++++ wpa_supplicant-0.4.5-new/driver_madwifi.c 2005-10-23 14:08:45.000000000 +0200 +@@ -27,11 +27,19 @@ + #include "wpa_supplicant.h" + #include "wpa.h" + ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ + #include + #include + #ifdef WME_NUM_AC +-/* Assume this is built against BSD branch of madwifi driver. */ +-#define MADWIFI_BSD + #include + #endif /* WME_NUM_AC */ + #include +@@ -78,19 +86,19 @@ + "ioctl[IEEE80211_IOCTL_SETKEY]", + "ioctl[IEEE80211_IOCTL_GETKEY]", + "ioctl[IEEE80211_IOCTL_DELKEY]", +- NULL, ++ "ioctl[IEEE80211_IOCTL_SETWMMPARAMS]", + "ioctl[IEEE80211_IOCTL_SETMLME]", +- NULL, ++ "ioctl[IEEE80211_IOCTL_GETCHANINFO]", + "ioctl[IEEE80211_IOCTL_SETOPTIE]", + "ioctl[IEEE80211_IOCTL_GETOPTIE]", + "ioctl[IEEE80211_IOCTL_ADDMAC]", + NULL, + "ioctl[IEEE80211_IOCTL_DELMAC]", +- NULL, +- "ioctl[IEEE80211_IOCTL_CHANLIST]", ++ "ioctl[IEEE80211_IOCTL_GETCHANLIST]", ++ "ioctl[IEEE80211_IOCTL_SETCHANLIST]", + }; + if (IEEE80211_IOCTL_SETPARAM <= op && +- op <= IEEE80211_IOCTL_CHANLIST) ++ op <= IEEE80211_IOCTL_SETCHANLIST) + perror(opnames[op - SIOCIWFIRSTPRIV]); + else + perror("ioctl[unknown???]"); -- 2.25.1