diff options
Diffstat (limited to 'package')
4 files changed, 23 insertions, 90 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index bddbd4c27..f62413eb2 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -17,12 +17,12 @@ ifneq ($(CONFIG_LINUX_2_6_21)$(CONFIG_LINUX_2_6_23)$(CONFIG_LINUX_2_6_24)$(CONFI PKG_MD5SUM:=9563ceeed86bca0859ad5f010623277c PATCH_DIR:=./patches-old else - PKG_VERSION:=2009-03-07 + PKG_VERSION:=2009-03-09 PKG_RELEASE:=1 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/03 \ http://wireless.kernel.org/download/compat-wireless-2.6 - PKG_MD5SUM:=4cb60588d90cbb0eb573cddd669cf35b + PKG_MD5SUM:=2fb00c2879e217f02c6b68069410f2e1 endif PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 diff --git a/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch b/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch index 27b4f5a05..7a2549019 100644 --- a/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch +++ b/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch @@ -22,9 +22,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.c create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.h - config RT2X00_LIB_PCI - tristate - select RT2X00_LIB --- a/drivers/net/wireless/rt2x00/Makefile +++ b/drivers/net/wireless/rt2x00/Makefile @@ -19,3 +19,4 @@ obj-$(CONFIG_RT61PCI) += rt61pci.o diff --git a/package/mac80211/patches/308-rt2x00-Fix-fill_rxdone-rt2800pci.patch b/package/mac80211/patches/308-rt2x00-Fix-fill_rxdone-rt2800pci.patch new file mode 100644 index 000000000..3cb614703 --- /dev/null +++ b/package/mac80211/patches/308-rt2x00-Fix-fill_rxdone-rt2800pci.patch @@ -0,0 +1,21 @@ +From 89950075234deb1f98ff52b225487ffc5b8199b0 Mon Sep 17 00:00:00 2001 +From: Ivo van Doorn <IvDoorn@gmail.com> +Date: Sun, 8 Mar 2009 16:47:28 +0100 +Subject: [PATCH] rt2x00: Fix fill_rxdone (rt2800pci) + +Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> +--- + drivers/net/wireless/rt2x00/rt2800pci.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +--- a/drivers/net/wireless/rt2x00/rt2800pci.c ++++ b/drivers/net/wireless/rt2x00/rt2800pci.c +@@ -2037,7 +2037,7 @@ static void rt2800pci_fill_rxdone(struct + /* + * Remove TXWI descriptor from start of buffer. + */ +- skb_pull(entry->skb, TXWI_DESC_SIZE); ++ skb_pull(entry->skb, RXWI_DESC_SIZE); + skb_trim(entry->skb, rxdesc->size); + } + diff --git a/package/mac80211/patches/309-rt2x00-Use-rt2x00usb_register_multiwrite-rt2800u.patch b/package/mac80211/patches/309-rt2x00-Use-rt2x00usb_register_multiwrite-rt2800u.patch deleted file mode 100644 index 29c31de7b..000000000 --- a/package/mac80211/patches/309-rt2x00-Use-rt2x00usb_register_multiwrite-rt2800u.patch +++ /dev/null @@ -1,85 +0,0 @@ -From d98dacd4b09b7ec428d5e9093a5e6f1f564b1d3c Mon Sep 17 00:00:00 2001 -From: Ivo van Doorn <IvDoorn@gmail.com> -Date: Wed, 4 Mar 2009 22:23:53 +0100 -Subject: [PATCH] rt2x00: Use rt2x00usb_register_multiwrite() (rt2800usb) - -Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> ---- - drivers/net/wireless/rt2x00/rt2800usb.c | 31 ++++++++----------------------- - 1 files changed, 8 insertions(+), 23 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt2800usb.c -+++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -396,7 +396,6 @@ static int rt2800usb_config_shared_key(s - { - struct hw_key_entry key_entry; - struct rt2x00_field32 field; -- int timeout; - u32 offset; - u32 reg; - -@@ -411,12 +410,8 @@ static int rt2800usb_config_shared_key(s - sizeof(key_entry.rx_mic)); - - offset = SHARED_KEY_ENTRY(key->hw_key_idx); -- timeout = REGISTER_TIMEOUT32(sizeof(key_entry)); -- rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, -- USB_VENDOR_REQUEST_OUT, -- offset, &key_entry, -- sizeof(key_entry), -- timeout); -+ rt2x00usb_register_multiwrite(rt2x00dev, offset, -+ &key_entry, sizeof(key_entry)); - } - - /* -@@ -449,7 +444,6 @@ static int rt2800usb_config_pairwise_key - struct ieee80211_key_conf *key) - { - struct hw_key_entry key_entry; -- int timeout; - u32 offset; - - if (crypto->cmd == SET_KEY) { -@@ -467,12 +461,8 @@ static int rt2800usb_config_pairwise_key - sizeof(key_entry.rx_mic)); - - offset = PAIRWISE_KEY_ENTRY(key->hw_key_idx); -- timeout = REGISTER_TIMEOUT32(sizeof(key_entry)); -- rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, -- USB_VENDOR_REQUEST_OUT, -- offset, &key_entry, -- sizeof(key_entry), -- timeout); -+ rt2x00usb_register_multiwrite(rt2x00dev, offset, -+ &key_entry, sizeof(key_entry)); - } - - /* -@@ -1217,11 +1207,8 @@ static int rt2800usb_load_firmware(struc - /* - * Write firmware to device. - */ -- rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, -- USB_VENDOR_REQUEST_OUT, -- FIRMWARE_IMAGE_BASE, -- data + offset, length, -- REGISTER_TIMEOUT32(length)); -+ rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE, -+ (void *)(data + offset), length); - - rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0); - rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0); -@@ -2067,10 +2054,8 @@ static void rt2800usb_write_beacon(struc - * Write entire beacon with descriptor to register. - */ - beacon_base = HW_BEACON_OFFSET(entry->entry_idx); -- rt2x00usb_vendor_request_large_buff(rt2x00dev, USB_MULTI_WRITE, -- USB_VENDOR_REQUEST_OUT, beacon_base, -- entry->skb->data, entry->skb->len, -- REGISTER_TIMEOUT32(entry->skb->len)); -+ rt2x00usb_register_multiwrite(rt2x00dev, beacon_base, -+ entry->skb->data, entry->skb->len); - - /* - * Clean up the beacon skb. |