diff options
Diffstat (limited to 'openwrt')
4 files changed, 27 insertions, 14 deletions
diff --git a/openwrt/package/madwifi-tools/Makefile b/openwrt/package/madwifi-tools/Makefile index a7afde1cf..ba40241af 100644 --- a/openwrt/package/madwifi-tools/Makefile +++ b/openwrt/package/madwifi-tools/Makefile @@ -3,15 +3,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=madwifi -PKG_VERSION:=2005-08-13 +PKG_VERSION:=r1195-20051021 PKG_RELEASE:=1 -PKG_MD5SUM:=188127127aebd8815595c025a787d729 +PKG_MD5SUM:=5d6a52260ece434a2e3b4ff826a3c5f4 -PKG_SOURCE_URL:=http://madwifi.otaku42.de/2005/08/ -PKG_SOURCE:=$(PKG_NAME)-cvs-snapshot-$(PKG_VERSION).tar.bz2 -PKG_CAT:=bzcat +PKG_SOURCE_URL:=http://snapshots.madwifi.org +PKG_SOURCE:=$(PKG_NAME)-trunk-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-trunk-$(PKG_VERSION) include $(TOPDIR)/package/rules.mk @@ -33,6 +33,7 @@ $(IPKG_MADWIFI_TOOLS): $(PKG_BUILD_DIR)/tools/80211debug \ $(PKG_BUILD_DIR)/tools/athctrl \ $(PKG_BUILD_DIR)/tools/athkey \ + $(PKG_BUILD_DIR)/tools/wlanconfig \ $(IDIR_MADWIFI_TOOLS)/usr/sbin $(RSTRIP) $(IDIR_MADWIFI_TOOLS) $(IPKG_BUILD) $(IDIR_MADWIFI_TOOLS) $(PACKAGE_DIR) diff --git a/openwrt/target/linux/package/madwifi/Makefile b/openwrt/target/linux/package/madwifi/Makefile index 2f06a2285..18aeba38e 100644 --- a/openwrt/target/linux/package/madwifi/Makefile +++ b/openwrt/target/linux/package/madwifi/Makefile @@ -4,15 +4,15 @@ include $(TOPDIR)/rules.mk include ../../rules.mk PKG_NAME:=madwifi -PKG_VERSION:=2005-09-16 +PKG_VERSION:=r1195-20051021 PKG_RELEASE:=1 -PKG_MD5SUM:=af6959c971ffa1b38ec171833834b845 +PKG_MD5SUM:=5d6a52260ece434a2e3b4ff826a3c5f4 -PKG_SOURCE_URL:=http://madwifi.otaku42.de/2005/09/ -PKG_SOURCE:=$(PKG_NAME)-cvs-snapshot-$(PKG_VERSION).tar.bz2 -PKG_CAT:=bzcat +PKG_SOURCE_URL:=http://snapshots.madwifi.org +PKG_SOURCE:=$(PKG_NAME)-trunk-$(PKG_VERSION).tar.gz +PKG_CAT:=zcat -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-trunk-$(PKG_VERSION) ifeq ($(KERNEL_DIR),) KERNEL_DIR:=$(LINUX_DIR) @@ -58,7 +58,7 @@ $(IPKG_KMOD_MADWIFI): install -m0755 ./files/madwifi.init $(IDIR_KMOD_MADWIFI)/etc/init.d/S20madwifi cp -fpR $(PKG_BUILD_DIR)/net80211/wlan*.$(MODUL_SUFFIX) \ $(PKG_BUILD_DIR)/ath_hal/ath_hal.$(MODUL_SUFFIX) \ - $(PKG_BUILD_DIR)/ath_rate/sample/ath_rate_sample.$(MODUL_SUFFIX) \ + $(PKG_BUILD_DIR)/ath_rate/onoe/ath_rate_onoe.$(MODUL_SUFFIX) \ $(PKG_BUILD_DIR)/ath/ath_pci.$(MODUL_SUFFIX) \ $(IDIR_KMOD_MADWIFI)/lib/modules/$(LINUX_VERSION)/ $(IPKG_BUILD) $(IDIR_KMOD_MADWIFI) $(PACKAGE_DIR) diff --git a/openwrt/target/linux/package/madwifi/files/madwifi.modules b/openwrt/target/linux/package/madwifi/files/madwifi.modules index eb8ca2e85..d50323040 100644 --- a/openwrt/target/linux/package/madwifi/files/madwifi.modules +++ b/openwrt/target/linux/package/madwifi/files/madwifi.modules @@ -1,6 +1,6 @@ wlan ath_hal -ath_rate_sample +ath_rate_onoe ath_pci wlan_acl wlan_ccmp diff --git a/openwrt/target/linux/package/madwifi/patches/105-kernel_version_fix.patch b/openwrt/target/linux/package/madwifi/patches/105-kernel_version_fix.patch new file mode 100644 index 000000000..f34c2ce75 --- /dev/null +++ b/openwrt/target/linux/package/madwifi/patches/105-kernel_version_fix.patch @@ -0,0 +1,12 @@ +diff -ur madwifi-svn/net80211/ieee80211_linux.h madwifi-svn.openwrt/net80211/ieee80211_linux.h +--- madwifi-svn/net80211/ieee80211_linux.h 2005-10-22 18:16:58.000000000 +0200 ++++ madwifi-svn.openwrt/net80211/ieee80211_linux.h 2005-10-22 18:31:50.000000000 +0200 +@@ -341,7 +341,7 @@ + } + #endif + /* XXX not in 2.6.6 but is in 2.6.10; might have appeared earlier */ +-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) && LINUX_VERSION_CODE < KERNEL_VERSION(2,4,31) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) && LINUX_VERSION_CODE < KERNEL_VERSION(2,4,30) + static __inline unsigned long msecs_to_jiffies(const unsigned int m) + { + return (m * HZ + 999) / 1000; |