diff -Nrub packages.old/iw/Makefile packages.new/iw/Makefile
--- packages.old/iw/Makefile	2008-07-21 06:47:00.000000000 +0300
+++ packages.new/iw/Makefile	2008-07-21 07:32:40.000000000 +0300
@@ -9,13 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iw
-PKG_REV:=4d3a72da3f21761bf4f2866a6a3400d4ecf67365
-PKG_VERSION:=20080414_$(PKG_REV)
+PKG_VERSION:=20080630
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://git.sipsolutions.net/iw.git
-PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=http://wifi.ozo.com/airo/source/packages/
+PKG_MD5SUM:=f08b8b7177e86617e1ebe012cacc56f3
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_BUILD_DEPENDS:=mac80211 libnl
diff -Nrub packages.old/kernel/modules/crypto.mk packages.new/kernel/modules/crypto.mk
--- packages.old/kernel/modules/crypto.mk	2008-07-21 06:47:02.000000000 +0300
+++ packages.new/kernel/modules/crypto.mk	2008-07-21 07:51:00.000000000 +0300
@@ -39,27 +39,21 @@
 	CONFIG_CRYPTO_HMAC \
 	CONFIG_CRYPTO_MANAGER
   FILES:= \
-	$(LINUX_DIR)/crypto/crypto_algapi.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/$(CRYPTO_PREFIX)blkcipher.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/cbc.$(LINUX_KMOD_SUFFIX) \
-	$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/ecb.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/crypto_hash.$(LINUX_KMOD_SUFFIX) \
 	$(LINUX_DIR)/crypto/cryptomgr.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,01, \
-	crypto_algapi \
 	cryptomgr \
 	crypto_hash \
 	$(CRYPTO_PREFIX)blkcipher \
 	cbc \
 	ecb \
-	deflate \
   )
 endef
 
 define KernelPackage/crypto-core/2.4
-  FILES:=$(LINUX_DIR)/crypto/deflate.$(LINUX_KMOD_SUFFIX)
-  AUTOLOAD:=$(call AutoLoad,01, deflate)
 endef
 
 $(eval $(call KernelPackage,crypto-core))
diff -Nrub packages.old/mac80211/Makefile packages.new/mac80211/Makefile
--- packages.old/mac80211/Makefile	2008-07-21 06:47:02.000000000 +0300
+++ packages.new/mac80211/Makefile	2008-07-20 20:19:57.000000000 +0300
@@ -12,9 +12,9 @@
 PKG_NAME:=mac80211
 PKG_RELEASE:=1
 
-PKG_VERSION:=$(if $(CONFIG_TARGET_brcm47xx),2008-05-26,2008-07-19)
+PKG_VERSION:=2008-07-19
 PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/07
+PKG_SOURCE_URL:=http://www.orbit-lab.org/kernel/compat-wireless-2.6/2008/05
 #PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/
 PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
 
@@ -23,7 +23,7 @@
 define KernelPackage/mac80211
   SUBMENU:=Wireless Drivers
   TITLE:=Linux 802.11 Wireless Networking Stack
-  DEPENDS:=@LINUX_2_6 +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools
+  DEPENDS:=@LINUX_2_6_23||LINUX_2_6_24||LINUX_2_6_25 +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools +iw
   FILES:= \
 	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
@@ -98,6 +98,15 @@
   AUTOLOAD:=$(call AutoLoad,27,rt2500pci)
 endef
 
+define KernelPackage/ath5k
+  SUBMENU:=Wireless Drivers
+  $(call KernelPackage/ath5k/Default)
+  DEPENDS+= @PCI_SUPPORT +kmod-mac80211 +kmod-ieee80211 
+  TITLE+= (Ath5k GPL Drivers dor Atheros cards)
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath5k/ath5k.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,27,ath5k)
+endef
+
 define KernelPackage/rt2500-usb
 $(call KernelPackage/rt2x00/Default)
   DEPENDS+= @USB_SUPPORT +kmod-rt2x00-usb +kmod-crc-itu-t
@@ -168,9 +177,8 @@
 endef
 
 define Build/InstallDev
-	mkdir -p $(1)/usr/include/mac80211 $(1)/usr/include/net/mac80211
+	mkdir -p $(1)/usr/include/mac80211
 	$(CP) $(PKG_BUILD_DIR)/net/mac80211/*.h $(PKG_BUILD_DIR)/include/* $(1)/usr/include/mac80211/
-	$(CP) $(PKG_BUILD_DIR)/net/mac80211/rate.h $(1)/usr/include/net/mac80211/
 endef
 
 define KernelPackage/mac80211/install
@@ -198,3 +206,4 @@
 $(eval $(call KernelPackage,rt2500-usb))
 $(eval $(call KernelPackage,rt61-pci))
 $(eval $(call KernelPackage,rt73-usb))
+$(eval $(call KernelPackage,ath5k))
diff -Nrub packages.old/mac80211/patches/001-disable_drivers.patch packages.new/mac80211/patches/001-disable_drivers.patch
--- packages.old/mac80211/patches/001-disable_drivers.patch	2008-07-21 06:47:02.000000000 +0300
+++ packages.new/mac80211/patches/001-disable_drivers.patch	2008-07-19 20:16:28.000000000 +0300
@@ -1,12 +1,18 @@
-diff -urN compat-wireless-2008-05-26/config.mk compat-wireless-2008-05-26.new/config.mk
---- compat-wireless-2008-05-26/config.mk	2008-05-20 09:37:02.000000000 +0200
-+++ compat-wireless-2008-05-26.new/config.mk	2008-07-14 10:52:01.000000000 +0200
-@@ -28,73 +28,6 @@
- # PCI Drivers
- ifneq ($(CONFIG_PCI),)
+--- compat-wireless-2008-07-19/config-old.mk	2008-07-19 20:13:09.000000000 +0300
++++ compat-wireless-2008-07-19/config.mk	2008-07-19 20:14:09.000000000 +0300
+@@ -7,8 +7,6 @@
+ ifeq ($(wildcard $(KLIB_BUILD)/.config),)
+ # These will be ignored by compat autoconf
+  CONFIG_PCI=y
+- CONFIG_USB=y
+- CONFIG_PCMCIA=y
+ else
+ include $(KLIB_BUILD)/.config
+ endif
+@@ -71,175 +69,6 @@
  
--CONFIG_ATH5K=m
--CONFIG_ATH5K_DEBUG=n
+ CONFIG_ATH5K=m
+ CONFIG_ATH5K_DEBUG=n
 -
 -# Required for older kernels which still use this flag.
 -CONFIG_IWLWIFI=m
@@ -72,13 +78,29 @@
 -CONFIG_RTL8180=m
 -CONFIG_ADM8211=m
 -
- CONFIG_RT2X00_LIB_PCI=m
- CONFIG_RT2400PCI=m
- CONFIG_RT2500PCI=m
-@@ -118,32 +51,6 @@
- ifneq ($(CONFIG_USB),)
- CONFIG_ZD1211RW=m
- 
+-CONFIG_RT2X00_LIB_PCI=m
+-CONFIG_RT2400PCI=m
+-CONFIG_RT2500PCI=m
+-NEED_RT2X00=y
+-
+-# Two rt2x00 drivers require firmware: rt61pci and rt73usb. They depend on
+-# CRC to check the firmware. We check here first for the PCI
+-# driver as we're in the PCI section.
+-ifneq ($(CONFIG_CRC_ITU_T),)
+-CONFIG_RT61PCI=m
+-NEED_RT2X00_FIRMWARE=y
+-endif
+-
+-endif
+-## end of PCI
+-
+-# This is required for some cards
+-CONFIG_EEPROM_93CX6=m
+-
+-# USB Drivers
+-ifneq ($(CONFIG_USB),)
+-CONFIG_ZD1211RW=m
+-
 -# support for USB Wireless devices using Atmel at76c503,
 -# at76c505 or at76c505a chips.
 -CONFIG_USB_ATMEL=m
@@ -105,13 +127,30 @@
 -CONFIG_P54_USB=m
 -CONFIG_RTL8187=m
 -
- # RT2500USB does not require firmware
- CONFIG_RT2500USB=m
- CONFIG_RT2X00_LIB_USB=m
-@@ -168,39 +75,6 @@
- CONFIG_RT2X00_LIB_FIRMWARE=y
- endif
- 
+-# RT2500USB does not require firmware
+-CONFIG_RT2500USB=m
+-CONFIG_RT2X00_LIB_USB=m
+-NEED_RT2X00=y
+-# RT73USB requires firmware
+-ifneq ($(CONFIG_CRC_ITU_T),)
+-CONFIG_RT73USB=m
+-NEED_RT2X00_FIRMWARE=y
+-endif
+-
+-endif # end of USB driver list
+-
+-# Common rt2x00 requirements
+-ifeq ($(NEED_RT2X00),y)
+-CONFIG_RT2X00=m
+-CONFIG_RT2X00_LIB=m
+-# CONFIG_RT2X00_LIB_DEBUGFS is not set
+-# CONFIG_RT2X00_DEBUG is not set
+-endif
+-
+-ifeq ($(NEED_RT2X00_FIRMWARE),y)
+-CONFIG_RT2X00_LIB_FIRMWARE=y
+-endif
+-
 -# p54
 -CONFIG_P54_COMMON=m
 -
@@ -143,8 +182,11 @@
 -# Libertas uses the old stack but not fully, it will soon 
 -# be cleaned.
 -NEED_IEEE80211=y
--endif
--
+ endif
+ 
  ifeq ($(NEED_IEEE80211),y)
- # Old ieee80211 "stack"
- # Note: old softmac is scheduled for removal so we
+@@ -252,3 +81,4 @@
+ CONFIG_IEEE80211_CRYPT_WEP=m
+ CONFIG_IEEE80211_SOFTMAC=n
+ endif
++
diff -Nrub packages.old/mac80211/patches/002-headers-fix.patch packages.new/mac80211/patches/002-headers-fix.patch
--- packages.old/mac80211/patches/002-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/002-headers-fix.patch	2008-07-19 19:44:35.000000000 +0300
@@ -0,0 +1,11 @@
+--- compat-wireless-2008-07-19/drivers/net/wireless/mac80211_hwsim.c	2008-07-19 19:42:38.000000000 +0300
++++ compat-wireless-2008-07-19/drivers/net/wireless/mac80211_hwsim-new.c	2008-07-19 19:42:24.000000000 +0300
+@@ -15,7 +15,7 @@
+  */
+ 
+ #include <net/mac80211.h>
+-#include <net/ieee80211_radiotap.h>
++#include "net/ieee80211_radiotap.h"
+ #include <linux/if_arp.h>
+ #include <linux/rtnetlink.h>
+ #include <linux/etherdevice.h>
diff -Nrub packages.old/mac80211/patches/003-headers-fix.patch packages.new/mac80211/patches/003-headers-fix.patch
--- packages.old/mac80211/patches/003-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/003-headers-fix.patch	2008-07-19 19:47:58.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/include/net/ieee80211_radiotap.h	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/include/net/ieee80211_radiotap-new.h	2008-07-19 19:46:20.000000000 +0300
+@@ -40,7 +40,6 @@
+ 
+ #include <linux/if_ether.h>
+ #include <linux/kernel.h>
+-#include <asm/unaligned.h>
+ 
+ /* Radiotap header version (from official NetBSD feed) */
+ #define IEEE80211RADIOTAP_VERSION	"1.5"
diff -Nrub packages.old/mac80211/patches/004-headers-fix.patch packages.new/mac80211/patches/004-headers-fix.patch
--- packages.old/mac80211/patches/004-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/004-headers-fix.patch	2008-07-19 19:50:21.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/drivers/net/wireless/ath5k/base.c	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/drivers/net/wireless/ath5k/base-new.c	2008-07-19 19:49:10.000000000 +0300
+@@ -52,7 +52,6 @@
+ 
+ #include <net/ieee80211_radiotap.h>
+ 
+-#include <asm/unaligned.h>
+ 
+ #include "base.h"
+ #include "reg.h"
diff -Nrub packages.old/mac80211/patches/005-headers-fix.patch packages.new/mac80211/patches/005-headers-fix.patch
--- packages.old/mac80211/patches/005-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/005-headers-fix.patch	2008-07-19 19:53:06.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/mesh.h	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/mesh-new.h	2008-07-19 19:52:18.000000000 +0300
+@@ -13,7 +13,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/jhash.h>
+-#include <asm/unaligned.h>
+ #include "ieee80211_i.h"
+ 
+ 
diff -Nrub packages.old/mac80211/patches/006-headers-fix.patch packages.new/mac80211/patches/006-headers-fix.patch
--- packages.old/mac80211/patches/006-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/006-headers-fix.patch	2008-07-19 19:57:31.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/wpa.c	2008-07-19 19:54:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/wpa-new.c	2008-07-19 19:56:45.000000000 +0300
+@@ -11,7 +11,6 @@
+ #include <linux/skbuff.h>
+ #include <linux/compiler.h>
+ #include <linux/ieee80211.h>
+-#include <asm/unaligned.h>
+ #include <net/mac80211.h>
+ 
+ #include "ieee80211_i.h"
diff -Nrub packages.old/mac80211/patches/007-headers-fix.patch packages.new/mac80211/patches/007-headers-fix.patch
--- packages.old/mac80211/patches/007-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/007-headers-fix.patch	2008-07-19 19:59:07.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/michael.c	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/michael-new.c	2008-07-19 19:58:28.000000000 +0300
+@@ -9,7 +9,6 @@
+ #include <linux/types.h>
+ #include <linux/bitops.h>
+ #include <linux/ieee80211.h>
+-#include <asm/unaligned.h>
+ 
+ #include "michael.h"
+ 
diff -Nrub packages.old/mac80211/patches/008-headers-fix.patch packages.new/mac80211/patches/008-headers-fix.patch
--- packages.old/mac80211/patches/008-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/008-headers-fix.patch	2008-07-19 20:00:45.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/tkip.c	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/tkip-new.c	2008-07-19 19:59:57.000000000 +0300
+@@ -10,7 +10,6 @@
+ #include <linux/bitops.h>
+ #include <linux/types.h>
+ #include <linux/netdevice.h>
+-#include <asm/unaligned.h>
+ 
+ #include <net/mac80211.h>
+ #include "key.h"
diff -Nrub packages.old/mac80211/patches/009-headers-fix.patch packages.new/mac80211/patches/009-headers-fix.patch
--- packages.old/mac80211/patches/009-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/009-headers-fix.patch	2008-07-19 20:02:29.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/tx.c	2008-07-19 07:11:00.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/tx-new.c	2008-07-19 20:01:46.000000000 +0300
+@@ -24,7 +24,6 @@
+ #include <net/ieee80211_radiotap.h>
+ #include <net/cfg80211.h>
+ #include <net/mac80211.h>
+-#include <asm/unaligned.h>
+ 
+ #if (LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,22))
+ #include "mq_compat.h" /* Internal MQ backport support for older kernels */
diff -Nrub packages.old/mac80211/patches/010-headers-fix.patch packages.new/mac80211/patches/010-headers-fix.patch
--- packages.old/mac80211/patches/010-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/010-headers-fix.patch	2008-07-19 20:04:01.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/mac80211/mesh.c	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/mac80211/mesh-new.c	2008-07-19 20:03:23.000000000 +0300
+@@ -8,7 +8,6 @@
+  * published by the Free Software Foundation.
+  */
+ 
+-#include <asm/unaligned.h>
+ #include "ieee80211_i.h"
+ #include "mesh.h"
+ 
diff -Nrub packages.old/mac80211/patches/011-headers-fix.patch packages.new/mac80211/patches/011-headers-fix.patch
--- packages.old/mac80211/patches/011-headers-fix.patch	1970-01-01 02:00:00.000000000 +0200
+++ packages.new/mac80211/patches/011-headers-fix.patch	2008-07-19 20:05:36.000000000 +0300
@@ -0,0 +1,10 @@
+--- compat-wireless-2008-07-19/net/wireless/radiotap.c	2008-07-19 07:10:59.000000000 +0300
++++ compat-wireless-2008-07-19/net/wireless/radiotap-new.c	2008-07-19 20:04:54.000000000 +0300
+@@ -6,7 +6,6 @@
+ 
+ #include <net/cfg80211.h>
+ #include <net/ieee80211_radiotap.h>
+-#include <asm/unaligned.h>
+ 
+ /* function prototypes and related defs are in include/net/cfg80211.h */
+ 
