diff options
26 files changed, 81 insertions, 203 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index fc71e9243..7a4f8dd35 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 ifneq ($(CONFIG_LINUX_2_6_27)$(CONFIG_LINUX_2_6_28),) - PKG_VERSION:=2009-02-20 + PKG_VERSION:=2009-02-25 PKG_RELEASE:=1 PKG_SOURCE_URL:= \ http://www.orbit-lab.org/kernel/compat-wireless-2.6/2009/02 \ http://wireless.kernel.org/download/compat-wireless-2.6 - PKG_MD5SUM:=81a23a3c864eececd81c21abeeda1eaf + PKG_MD5SUM:=5dddce683bea04376ceee3a91902d5dd else PKG_VERSION:=2008-08-06 PKG_RELEASE:=2 diff --git a/package/mac80211/patches/007-remove_unused_stuff.patch b/package/mac80211/patches/007-remove_unused_stuff.patch index 1e85f5495..a8f167f13 100644 --- a/package/mac80211/patches/007-remove_unused_stuff.patch +++ b/package/mac80211/patches/007-remove_unused_stuff.patch @@ -1,6 +1,6 @@ --- a/config.mk +++ b/config.mk -@@ -90,10 +90,10 @@ CONFIG_MAC80211_MESH=y +@@ -91,10 +91,10 @@ CONFIG_MAC80211_MESH=y CONFIG_CFG80211=m # CONFIG_CFG80211_REG_DEBUG is not set @@ -15,7 +15,7 @@ CONFIG_NL80211=y -@@ -130,16 +130,16 @@ CONFIG_IWL3945_LEDS=y +@@ -131,16 +131,16 @@ CONFIG_IWL3945_LEDS=y CONFIG_B43=m CONFIG_B43_PCI_AUTOSELECT=y CONFIG_B43_PCICORE_AUTOSELECT=y @@ -35,7 +35,7 @@ # CONFIG_B43LEGACY_RFKILL=y # CONFIG_B43LEGACY_DEBUG=y CONFIG_B43LEGACY_DMA=y -@@ -149,17 +149,17 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y +@@ -150,17 +150,17 @@ CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y # CONFIG_B43LEGACY_PIO_MODE is not set # The Intel ipws @@ -61,7 +61,7 @@ # CONFIG_IPW2200_DEBUG is not set # The above enables use a second interface prefixed 'rtap'. # Example usage: -@@ -282,15 +282,15 @@ CONFIG_SSB_SPROM=y +@@ -283,15 +283,15 @@ CONFIG_SSB_SPROM=y ifneq ($(CONFIG_USB),) ifneq ($(CONFIG_LIBERTAS_THINFIRM_USB),m) CONFIG_LIBERTAS_USB=m diff --git a/package/mac80211/patches/201-ath5k_eeprom.patch b/package/mac80211/patches/201-ath5k_eeprom.patch index 5dfbcf3be..b42110d9b 100644 --- a/package/mac80211/patches/201-ath5k_eeprom.patch +++ b/package/mac80211/patches/201-ath5k_eeprom.patch @@ -23,25 +23,25 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> - freq1 = (val >> 8) & 0xff; - freq2 = val & 0xff; -- -- if (freq1) { -- pc[i++].freq = ath5k_eeprom_bin2freq(ee, -- freq1, mode); -- ee->ee_n_piers[mode]++; -- } + freq1 = val & 0xff; + if (!freq1) + break; -- if (freq2) { +- if (freq1) { - pc[i++].freq = ath5k_eeprom_bin2freq(ee, -- freq2, mode); +- freq1, mode); - ee->ee_n_piers[mode]++; - } + pc[i++].freq = ath5k_eeprom_bin2freq(ee, + freq1, mode); + ee->ee_n_piers[mode]++; +- if (freq2) { +- pc[i++].freq = ath5k_eeprom_bin2freq(ee, +- freq2, mode); +- ee->ee_n_piers[mode]++; +- } +- - if (!freq1 || !freq2) + freq2 = (val >> 8) & 0xff; + if (!freq2) @@ -79,8 +79,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> - if ((ee->ee_x_gain[mode] >> 2) & 0x1) pd_gains++; - if ((ee->ee_x_gain[mode] >> 3) & 0x1) pd_gains++; - ee->ee_pd_gains[mode] = pd_gains; -+ u8 pd_gains; - +- - offset = ath5k_cal_data_offset_2413(ee, mode); - ee->ee_n_piers[mode] = 0; - switch (mode) { @@ -95,7 +94,8 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> - case AR5K_EEPROM_MODE_11B: - if (!AR5K_EEPROM_HDR_11B(ee->ee_header)) - return 0; -- ++ u8 pd_gains; + - ath5k_eeprom_init_11bg_2413(ah, mode, offset); - offset += AR5K_EEPROM_N_2GHZ_CHAN_2413 / 2; - gen_chan_info = ee->ee_pwr_cal_b; diff --git a/package/mac80211/patches/304-rt2x00-Remove-unused-define-rt2800pci.patch b/package/mac80211/patches/304-rt2x00-Remove-unused-define-rt2800pci.patch index 21cfa0d0e..e5c4243fe 100644 --- a/package/mac80211/patches/304-rt2x00-Remove-unused-define-rt2800pci.patch +++ b/package/mac80211/patches/304-rt2x00-Remove-unused-define-rt2800pci.patch @@ -8,8 +8,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h -index d02350a..73f3f2a 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.h +++ b/drivers/net/wireless/rt2x00/rt2800pci.h @@ -250,11 +250,6 @@ @@ -24,6 +22,3 @@ index d02350a..73f3f2a 100644 * GPIO_CTRL_CFG: */ #define GPIO_CTRL_CFG 0x0228 --- -1.6.0 - diff --git a/package/mac80211/patches/305-rt2x00-Remove-unused-define-rt2800usb.patch b/package/mac80211/patches/305-rt2x00-Remove-unused-define-rt2800usb.patch index 19b758bc7..e80b7afb1 100644 --- a/package/mac80211/patches/305-rt2x00-Remove-unused-define-rt2800usb.patch +++ b/package/mac80211/patches/305-rt2x00-Remove-unused-define-rt2800usb.patch @@ -8,8 +8,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h -index ee16bf1..def9ce3 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -229,11 +229,6 @@ @@ -24,6 +22,3 @@ index ee16bf1..def9ce3 100644 * GPIO_CTRL_CFG: */ #define GPIO_CTRL_CFG 0x0228 --- -1.6.0 - diff --git a/package/mac80211/patches/306-rt2x00-Clean-header-rt2800pci.patch b/package/mac80211/patches/306-rt2x00-Clean-header-rt2800pci.patch index 528675734..f8dfc5d4c 100644 --- a/package/mac80211/patches/306-rt2x00-Clean-header-rt2800pci.patch +++ b/package/mac80211/patches/306-rt2x00-Clean-header-rt2800pci.patch @@ -8,8 +8,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h -index 73f3f2a..39f045c 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.h +++ b/drivers/net/wireless/rt2x00/rt2800pci.h @@ -342,7 +342,7 @@ @@ -39,6 +37,3 @@ index 73f3f2a..39f045c 100644 */ #define EEPROM_TXPOWER_BG1 0x0029 #define EEPROM_TXPOWER_BG2 0x0030 --- -1.6.0 - diff --git a/package/mac80211/patches/307-rt2x00-Clean-header-rt2800usb.patch b/package/mac80211/patches/307-rt2x00-Clean-header-rt2800usb.patch index 549385362..a84d2e68a 100644 --- a/package/mac80211/patches/307-rt2x00-Clean-header-rt2800usb.patch +++ b/package/mac80211/patches/307-rt2x00-Clean-header-rt2800usb.patch @@ -8,8 +8,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h -index def9ce3..db2eedd 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -1213,7 +1213,7 @@ @@ -30,6 +28,3 @@ index def9ce3..db2eedd 100644 * Three section discontinue memory segments will be used. * 1. The original region for BCN 0~3 * 2. Extract memory from FCE table for BCN 4~5 --- -1.6.0 - diff --git a/package/mac80211/patches/308-rt2x00-Uncomment-get_tsf-rt2800usb.patch b/package/mac80211/patches/308-rt2x00-Uncomment-get_tsf-rt2800usb.patch index 23a7898e9..78e209c09 100644 --- a/package/mac80211/patches/308-rt2x00-Uncomment-get_tsf-rt2800usb.patch +++ b/package/mac80211/patches/308-rt2x00-Uncomment-get_tsf-rt2800usb.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 004dc57..ab00d4d 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -2696,13 +2696,6 @@ static int rt2800usb_conf_tx(struct ieee80211_hw *hw, u16 queue_idx, +@@ -2696,13 +2696,6 @@ static int rt2800usb_conf_tx(struct ieee return 0; } @@ -26,7 +24,7 @@ index 004dc57..ab00d4d 100644 static u64 rt2800usb_get_tsf(struct ieee80211_hw *hw) { struct rt2x00_dev *rt2x00dev = hw->priv; -@@ -2716,9 +2709,6 @@ static u64 rt2800usb_get_tsf(struct ieee80211_hw *hw) +@@ -2716,9 +2709,6 @@ static u64 rt2800usb_get_tsf(struct ieee return tsf; } @@ -36,6 +34,3 @@ index 004dc57..ab00d4d 100644 static const struct ieee80211_ops rt2800usb_mac80211_ops = { .tx = rt2x00mac_tx, --- -1.6.0 - diff --git a/package/mac80211/patches/309-rt2x00-Fix-MCS-rx_mask-rt2800pci.patch b/package/mac80211/patches/309-rt2x00-Fix-MCS-rx_mask-rt2800pci.patch index 6d37ff986..78f301957 100644 --- a/package/mac80211/patches/309-rt2x00-Fix-MCS-rx_mask-rt2800pci.patch +++ b/package/mac80211/patches/309-rt2x00-Fix-MCS-rx_mask-rt2800pci.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index 679f69a..95eb053 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -2193,6 +2193,13 @@ static int rt2800pci_validate_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -2193,6 +2193,13 @@ static int rt2800pci_validate_eeprom(str rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2820); rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word); EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word); @@ -26,7 +24,7 @@ index 679f69a..95eb053 100644 } rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word); -@@ -2416,6 +2423,7 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2416,6 +2423,7 @@ static int rt2800pci_probe_hw_mode(struc char *tx_power1; char *tx_power2; unsigned int i; @@ -34,7 +32,7 @@ index 679f69a..95eb053 100644 /* * Initialize all hw fields. -@@ -2432,6 +2440,8 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2432,6 +2440,8 @@ static int rt2800pci_probe_hw_mode(struc rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0)); @@ -43,7 +41,7 @@ index 679f69a..95eb053 100644 /* * Initialize hw_mode information. */ -@@ -2463,11 +2473,19 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2463,11 +2473,19 @@ static int rt2800pci_probe_hw_mode(struc IEEE80211_HT_CAP_PSMP_SUPPORT; spec->ht.ampdu_factor = 3; spec->ht.ampdu_density = 4; @@ -65,6 +63,3 @@ index 679f69a..95eb053 100644 /* * Create channel information array */ --- -1.6.0 - diff --git a/package/mac80211/patches/310-rt2x00-Fix-MCS-rx_mask-rt2800usb.patch b/package/mac80211/patches/310-rt2x00-Fix-MCS-rx_mask-rt2800usb.patch index 46e9c92f9..87e0ca255 100644 --- a/package/mac80211/patches/310-rt2x00-Fix-MCS-rx_mask-rt2800usb.patch +++ b/package/mac80211/patches/310-rt2x00-Fix-MCS-rx_mask-rt2800usb.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index ab00d4d..1709e87 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -2215,6 +2215,13 @@ static int rt2800usb_validate_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -2215,6 +2215,13 @@ static int rt2800usb_validate_eeprom(str rt2x00_set_field16(&word, EEPROM_ANTENNA_RF_TYPE, RF2820); rt2x00_eeprom_write(rt2x00dev, EEPROM_ANTENNA, word); EEPROM(rt2x00dev, "Antenna: 0x%04x\n", word); @@ -26,7 +24,7 @@ index ab00d4d..1709e87 100644 } rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC, &word); -@@ -2465,6 +2472,7 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2465,6 +2472,7 @@ static int rt2800usb_probe_hw_mode(struc char *tx_power1; char *tx_power2; unsigned int i; @@ -34,7 +32,7 @@ index ab00d4d..1709e87 100644 /* * Initialize all hw fields. -@@ -2481,6 +2489,8 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2481,6 +2489,8 @@ static int rt2800usb_probe_hw_mode(struc rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0)); @@ -43,7 +41,7 @@ index ab00d4d..1709e87 100644 /* * Initialize HT information. */ -@@ -2495,11 +2505,19 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2495,11 +2505,19 @@ static int rt2800usb_probe_hw_mode(struc IEEE80211_HT_CAP_PSMP_SUPPORT; spec->ht.ampdu_factor = 3; spec->ht.ampdu_density = 4; @@ -65,6 +63,3 @@ index ab00d4d..1709e87 100644 /* * Initialize hw_mode information. */ --- -1.6.0 - diff --git a/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch b/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch index 635cdeef1..310e22f04 100644 --- a/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch +++ b/package/mac80211/patches/311-rt2x00-Channel-HT40-fixes-rt2800pci.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.h | 3 +- 2 files changed, 36 insertions(+), 36 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index 95eb053..ddea65b 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -603,7 +603,7 @@ static void rt2800pci_config_ant(struct rt2x00_dev *rt2x00dev, +@@ -603,7 +603,7 @@ static void rt2800pci_config_ant(struct rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0); break; case 2: @@ -22,7 +20,7 @@ index 95eb053..ddea65b 100644 break; case 3: /* Do nothing */ -@@ -653,6 +653,7 @@ static void rt2800pci_config_lna_gain(struct rt2x00_dev *rt2x00dev, +@@ -653,6 +653,7 @@ static void rt2800pci_config_lna_gain(st } static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev, @@ -30,7 +28,7 @@ index 95eb053..ddea65b 100644 struct rf_channel *rf, struct channel_info *info) { -@@ -660,34 +661,20 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -660,34 +661,20 @@ static void rt2800pci_config_channel(str unsigned int tx_pin; u16 eeprom; @@ -66,7 +64,7 @@ index 95eb053..ddea65b 100644 } else if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH) == 2) rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_RX2, 1); -@@ -715,19 +702,14 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -715,19 +702,14 @@ static void rt2800pci_config_channel(str rt2x00_set_field32(&rf->rf4, RF4_TXPOWER_A, TXPOWER_A_TO_DEV(info->tx_power2)); @@ -87,7 +85,7 @@ index 95eb053..ddea65b 100644 rt2800pci_rf_write(rt2x00dev, 1, rf->rf1); rt2800pci_rf_write(rt2x00dev, 2, rf->rf2); -@@ -764,11 +746,6 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -764,11 +746,6 @@ static void rt2800pci_config_channel(str rt2800pci_bbp_write(rt2x00dev, 82, 0x84); rt2800pci_bbp_write(rt2x00dev, 75, 0x50); } @@ -99,7 +97,7 @@ index 95eb053..ddea65b 100644 } else { rt2800pci_bbp_write(rt2x00dev, 82, 0xf2); -@@ -776,13 +753,35 @@ static void rt2800pci_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -776,13 +753,35 @@ static void rt2800pci_config_channel(str rt2800pci_bbp_write(rt2x00dev, 75, 0x46); else rt2800pci_bbp_write(rt2x00dev, 75, 0x50); @@ -139,7 +137,7 @@ index 95eb053..ddea65b 100644 rt2x00pci_register_write(rt2x00dev, TX_PIN_CFG, tx_pin); msleep(1); -@@ -917,8 +916,8 @@ static void rt2800pci_config(struct rt2x00_dev *rt2x00dev, +@@ -917,8 +916,8 @@ static void rt2800pci_config(struct rt2x rt2800pci_config_lna_gain(rt2x00dev, libconf); if (flags & IEEE80211_CONF_CHANGE_CHANNEL) @@ -150,7 +148,7 @@ index 95eb053..ddea65b 100644 if (flags & IEEE80211_CONF_CHANGE_POWER) rt2800pci_config_txpower(rt2x00dev, libconf->conf->power_level); if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS) -@@ -2724,14 +2723,14 @@ static const struct rt2x00lib_ops rt2800pci_rt2x00_ops = { +@@ -2724,14 +2723,14 @@ static const struct rt2x00lib_ops rt2800 static const struct data_queue_desc rt2800pci_queue_rx = { .entry_num = RX_ENTRIES, @@ -167,8 +165,6 @@ index 95eb053..ddea65b 100644 .desc_size = TXD_DESC_SIZE, .priv_size = sizeof(struct queue_entry_priv_pci), }; -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h -index 39f045c..0682a6a 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.h +++ b/drivers/net/wireless/rt2x00/rt2800pci.h @@ -791,6 +791,7 @@ @@ -188,6 +184,3 @@ index 39f045c..0682a6a 100644 /* * EEPROM content. --- -1.6.0 - diff --git a/package/mac80211/patches/312-rt2x00-Channel-HT40-fixes-rt2800usb.patch b/package/mac80211/patches/312-rt2x00-Channel-HT40-fixes-rt2800usb.patch index b9badda4e..471eae56a 100644 --- a/package/mac80211/patches/312-rt2x00-Channel-HT40-fixes-rt2800usb.patch +++ b/package/mac80211/patches/312-rt2x00-Channel-HT40-fixes-rt2800usb.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.h | 5 +- 2 files changed, 61 insertions(+), 51 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 1709e87..29ecaa8 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -641,7 +641,7 @@ static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev, +@@ -641,7 +641,7 @@ static void rt2800usb_config_ant(struct rt2x00_set_field8(&r3, BBP3_RX_ANTENNA, 0); break; case 2: @@ -22,7 +20,7 @@ index 1709e87..29ecaa8 100644 break; case 3: /* Do nothing */ -@@ -691,6 +691,7 @@ static void rt2800usb_config_lna_gain(struct rt2x00_dev *rt2x00dev, +@@ -691,6 +691,7 @@ static void rt2800usb_config_lna_gain(st } static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev, @@ -30,7 +28,7 @@ index 1709e87..29ecaa8 100644 struct rf_channel *rf, struct channel_info *info) { -@@ -702,6 +703,7 @@ static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev, +@@ -702,6 +703,7 @@ static void rt2800usb_config_channel_rt2 * Determine antenna settings from EEPROM */ rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &eeprom); @@ -38,7 +36,7 @@ index 1709e87..29ecaa8 100644 if (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_TXPATH) == 1) rt2x00_set_field32(&rf->rf2, RF2_ANTENNA_TX1, 1); -@@ -742,8 +744,7 @@ static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev, +@@ -742,8 +744,7 @@ static void rt2800usb_config_channel_rt2 TXPOWER_G_TO_DEV(info->tx_power2)); } @@ -48,7 +46,7 @@ index 1709e87..29ecaa8 100644 rt2800usb_rf_write(rt2x00dev, 1, rf->rf1); rt2800usb_rf_write(rt2x00dev, 2, rf->rf2); -@@ -766,6 +767,7 @@ static void rt2800usb_config_channel_rt2x(struct rt2x00_dev *rt2x00dev, +@@ -766,6 +767,7 @@ static void rt2800usb_config_channel_rt2 } static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev, @@ -56,7 +54,7 @@ index 1709e87..29ecaa8 100644 struct rf_channel *rf, struct channel_info *info) { -@@ -787,10 +789,12 @@ static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev, +@@ -787,10 +789,12 @@ static void rt2800usb_config_channel_rt3 rt2x00_set_field8(&rfcsr, RFCSR23_FREQ_OFFSET, rt2x00dev->freq_offset); rt2800usb_rfcsr_write(rt2x00dev, 23, rfcsr); @@ -72,7 +70,7 @@ index 1709e87..29ecaa8 100644 rt2800usb_rfcsr_read(rt2x00dev, 23, &rfcsr); rt2x00_set_field8(&rfcsr, RFCSR7_RF_TUNING, 1); -@@ -798,46 +802,24 @@ static void rt2800usb_config_channel_rt3x(struct rt2x00_dev *rt2x00dev, +@@ -798,46 +802,24 @@ static void rt2800usb_config_channel_rt3 } static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, @@ -127,7 +125,7 @@ index 1709e87..29ecaa8 100644 /* * Change BBP settings -@@ -855,11 +837,6 @@ static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -855,11 +837,6 @@ static void rt2800usb_config_channel(str rt2800usb_bbp_write(rt2x00dev, 82, 0x84); rt2800usb_bbp_write(rt2x00dev, 75, 0x50); } @@ -139,7 +137,7 @@ index 1709e87..29ecaa8 100644 } else { rt2800usb_bbp_write(rt2x00dev, 82, 0xf2); -@@ -867,15 +844,45 @@ static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -867,15 +844,45 @@ static void rt2800usb_config_channel(str rt2800usb_bbp_write(rt2x00dev, 75, 0x46); else rt2800usb_bbp_write(rt2x00dev, 75, 0x50); @@ -189,7 +187,7 @@ index 1709e87..29ecaa8 100644 msleep(1); } -@@ -1008,8 +1015,8 @@ static void rt2800usb_config(struct rt2x00_dev *rt2x00dev, +@@ -1008,8 +1015,8 @@ static void rt2800usb_config(struct rt2x rt2800usb_config_lna_gain(rt2x00dev, libconf); if (flags & IEEE80211_CONF_CHANGE_CHANNEL) @@ -200,7 +198,7 @@ index 1709e87..29ecaa8 100644 if (flags & IEEE80211_CONF_CHANGE_POWER) rt2800usb_config_txpower(rt2x00dev, libconf->conf->power_level); if (flags & IEEE80211_CONF_CHANGE_RETRY_LIMITS) -@@ -1643,7 +1650,7 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev, +@@ -1643,7 +1650,7 @@ static u8 rt2800usb_init_rx_filter(struc if (bw40) { rt2800usb_bbp_read(rt2x00dev, 4, &bbp); @@ -209,7 +207,7 @@ index 1709e87..29ecaa8 100644 rt2800usb_bbp_write(rt2x00dev, 4, bbp); } -@@ -2777,14 +2784,14 @@ static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = { +@@ -2777,14 +2784,14 @@ static const struct rt2x00lib_ops rt2800 static const struct data_queue_desc rt2800usb_queue_rx = { .entry_num = RX_ENTRIES, @@ -226,8 +224,6 @@ index 1709e87..29ecaa8 100644 .desc_size = TXINFO_DESC_SIZE + TXWI_DESC_SIZE, .priv_size = sizeof(struct queue_entry_priv_usb), }; -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h -index db2eedd..ffccc21 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -803,6 +803,7 @@ @@ -260,6 +256,3 @@ index db2eedd..ffccc21 100644 /* * EEPROM content. --- -1.6.0 - diff --git a/package/mac80211/patches/313-rt2x00-Add-RT2860C-BBP-channel-init-values-rt2800u.patch b/package/mac80211/patches/313-rt2x00-Add-RT2860C-BBP-channel-init-values-rt2800u.patch index e29b9fc6b..ce3a96704 100644 --- a/package/mac80211/patches/313-rt2x00-Add-RT2860C-BBP-channel-init-values-rt2800u.patch +++ b/package/mac80211/patches/313-rt2x00-Add-RT2860C-BBP-channel-init-values-rt2800u.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 29ecaa8..b9ef5ea 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -883,6 +883,18 @@ static void rt2800usb_config_channel(struct rt2x00_dev *rt2x00dev, +@@ -883,6 +883,18 @@ static void rt2800usb_config_channel(str rt2x00_set_field8(&bbp, BBP3_HT40_PLUS, conf_is_ht40_plus(conf)); rt2800usb_bbp_write(rt2x00dev, 3, bbp); @@ -31,6 +29,3 @@ index 29ecaa8..b9ef5ea 100644 msleep(1); } --- -1.6.0 - diff --git a/package/mac80211/patches/314-rt2x00-Remove-invalid-RX-antenna-init-rt2800usb.patch b/package/mac80211/patches/314-rt2x00-Remove-invalid-RX-antenna-init-rt2800usb.patch index d8b189d54..857f0e0dd 100644 --- a/package/mac80211/patches/314-rt2x00-Remove-invalid-RX-antenna-init-rt2800usb.patch +++ b/package/mac80211/patches/314-rt2x00-Remove-invalid-RX-antenna-init-rt2800usb.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index b9ef5ea..012f4de 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -638,7 +638,6 @@ static void rt2800usb_config_ant(struct rt2x00_dev *rt2x00dev, +@@ -638,7 +638,6 @@ static void rt2800usb_config_ant(struct switch (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_TXPATH)) { case 1: rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 0); @@ -20,6 +18,3 @@ index b9ef5ea..012f4de 100644 break; case 2: rt2x00_set_field8(&r1, BBP1_TX_ANTENNA, 2); --- -1.6.0 - diff --git a/package/mac80211/patches/315-rt2x00-Remove-check-for-rf-word-0-rt2800pci.patch b/package/mac80211/patches/315-rt2x00-Remove-check-for-rf-word-0-rt2800pci.patch index 1482a4a32..e5cf1e89f 100644 --- a/package/mac80211/patches/315-rt2x00-Remove-check-for-rf-word-0-rt2800pci.patch +++ b/package/mac80211/patches/315-rt2x00-Remove-check-for-rf-word-0-rt2800pci.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index ddea65b..86ed55c 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -125,9 +125,6 @@ static void rt2800pci_rf_write(struct rt2x00_dev *rt2x00dev, +@@ -125,9 +125,6 @@ static void rt2800pci_rf_write(struct rt { u32 reg; @@ -23,8 +21,6 @@ index ddea65b..86ed55c 100644 mutex_lock(&rt2x00dev->csr_mutex); /* -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h -index 0682a6a..f8bc958 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.h +++ b/drivers/net/wireless/rt2x00/rt2800pci.h @@ -68,8 +68,8 @@ @@ -38,6 +34,3 @@ index 0682a6a..f8bc958 100644 /* * Number of TX queues. --- -1.6.0 - diff --git a/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0-rt2800usb.patch b/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0-rt2800usb.patch index aa3afc79c..bff0f9547 100644 --- a/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0-rt2800usb.patch +++ b/package/mac80211/patches/316-rt2x00-Remove-check-for-rf-word-0-rt2800usb.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 012f4de..68ea600 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -182,9 +182,6 @@ static void rt2800usb_rf_write(struct rt2x00_dev *rt2x00dev, +@@ -182,9 +182,6 @@ static void rt2800usb_rf_write(struct rt { u32 reg; @@ -23,8 +21,6 @@ index 012f4de..68ea600 100644 mutex_lock(&rt2x00dev->csr_mutex); /* -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h -index ffccc21..f94c8f8 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -68,8 +68,8 @@ @@ -38,6 +34,3 @@ index ffccc21..f94c8f8 100644 /* * Number of TX queues. --- -1.6.0 - diff --git a/package/mac80211/patches/317-rt2x00-Export-all-register-stats-through-debugfs.patch b/package/mac80211/patches/317-rt2x00-Export-all-register-stats-through-debugfs.patch index d8aa77b63..1e525c091 100644 --- a/package/mac80211/patches/317-rt2x00-Export-all-register-stats-through-debugfs.patch +++ b/package/mac80211/patches/317-rt2x00-Export-all-register-stats-through-debugfs.patch @@ -20,11 +20,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2x00debug.c | 33 ++++++++++++++++++++-------- 1 files changed, 23 insertions(+), 10 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2x00debug.c b/drivers/net/wireless/rt2x00/rt2x00debug.c -index 8d47389..07d378e 100644 --- a/drivers/net/wireless/rt2x00/rt2x00debug.c +++ b/drivers/net/wireless/rt2x00/rt2x00debug.c -@@ -547,9 +547,9 @@ static struct dentry *rt2x00debug_create_file_driver(const char *name, +@@ -547,9 +547,9 @@ static struct dentry *rt2x00debug_create return NULL; blob->data = data; @@ -37,7 +35,7 @@ index 8d47389..07d378e 100644 blob->size = strlen(blob->data); return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob); -@@ -570,14 +570,27 @@ static struct dentry *rt2x00debug_create_file_chipset(const char *name, +@@ -570,14 +570,27 @@ static struct dentry *rt2x00debug_create return NULL; blob->data = data; @@ -72,6 +70,3 @@ index 8d47389..07d378e 100644 blob->size = strlen(blob->data); return debugfs_create_blob(name, S_IRUSR, intf->driver_folder, blob); --- -1.6.0 - diff --git a/package/mac80211/patches/318-rt2x00-Add-USB-id-rt2800usb.patch b/package/mac80211/patches/318-rt2x00-Add-USB-id-rt2800usb.patch index c1b6170fe..eab59297c 100644 --- a/package/mac80211/patches/318-rt2x00-Add-USB-id-rt2800usb.patch +++ b/package/mac80211/patches/318-rt2x00-Add-USB-id-rt2800usb.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 68ea600..ff24173 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -2900,6 +2900,7 @@ static struct usb_device_id rt2800usb_device_table[] = { +@@ -2900,6 +2900,7 @@ static struct usb_device_id rt2800usb_de { USB_DEVICE(0x0df6, 0x002b), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x0df6, 0x002c), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x0df6, 0x002d), USB_DEVICE_DATA(&rt2800usb_ops) }, @@ -20,6 +18,3 @@ index 68ea600..ff24173 100644 /* SMC */ { USB_DEVICE(0x083a, 0x6618), USB_DEVICE_DATA(&rt2800usb_ops) }, { USB_DEVICE(0x083a, 0x7522), USB_DEVICE_DATA(&rt2800usb_ops) }, --- -1.6.0 - diff --git a/package/mac80211/patches/319-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch b/package/mac80211/patches/319-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch index fa2e493cf..b80c461b0 100644 --- a/package/mac80211/patches/319-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch +++ b/package/mac80211/patches/319-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.h | 6 ------ 2 files changed, 22 insertions(+), 7 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index 86ed55c..6e98c3d 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -1374,6 +1374,8 @@ static int rt2800pci_init_registers(struct rt2x00_dev *rt2x00dev) +@@ -1374,6 +1374,8 @@ static int rt2800pci_init_registers(stru rt2x00pci_register_read(rt2x00dev, TX_RTS_CFG, ®); rt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32); @@ -22,7 +20,7 @@ index 86ed55c..6e98c3d 100644 rt2x00_set_field32(®, TX_RTS_CFG_RTS_FBK_EN, 0); rt2x00pci_register_write(rt2x00dev, TX_RTS_CFG, reg); -@@ -2470,7 +2472,10 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2470,7 +2472,10 @@ static int rt2800pci_probe_hw_mode(struc spec->ht.ampdu_factor = 3; spec->ht.ampdu_density = 4; spec->ht.mcs.tx_params = @@ -34,7 +32,7 @@ index 86ed55c..6e98c3d 100644 switch (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH)) { case 3: -@@ -2552,6 +2557,21 @@ static int rt2800pci_probe_hw(struct rt2x00_dev *rt2x00dev) +@@ -2552,6 +2557,21 @@ static int rt2800pci_probe_hw(struct rt2 /* * IEEE80211 stack callback functions. */ @@ -56,7 +54,7 @@ index 86ed55c..6e98c3d 100644 static int rt2800pci_set_rts_threshold(struct ieee80211_hw *hw, u32 value) { struct rt2x00_dev *rt2x00dev = hw->priv; -@@ -2681,6 +2701,7 @@ static const struct ieee80211_ops rt2800pci_mac80211_ops = { +@@ -2681,6 +2701,7 @@ static const struct ieee80211_ops rt2800 .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats, @@ -64,8 +62,6 @@ index 86ed55c..6e98c3d 100644 .set_rts_threshold = rt2800pci_set_rts_threshold, .bss_info_changed = rt2x00mac_bss_info_changed, .conf_tx = rt2800pci_conf_tx, -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.h b/drivers/net/wireless/rt2x00/rt2800pci.h -index f8bc958..ea2a431 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.h +++ b/drivers/net/wireless/rt2x00/rt2800pci.h @@ -1327,12 +1327,6 @@ struct mac_iveiv_entry { @@ -81,6 +77,3 @@ index f8bc958..ea2a431 100644 * MAC_WCID_ATTRIBUTE: */ #define MAC_WCID_ATTRIBUTE_KEYTAB FIELD32(0x00000001) --- -1.6.0 - diff --git a/package/mac80211/patches/320-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch b/package/mac80211/patches/320-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch index c2cc1fb2f..e276df213 100644 --- a/package/mac80211/patches/320-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch +++ b/package/mac80211/patches/320-rt2x00-support-get_tkip_seq-fix-TX-streams-rt2800.patch @@ -9,11 +9,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.h | 6 ------ 2 files changed, 22 insertions(+), 7 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index ff24173..7ec1270 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -1465,6 +1465,8 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev) +@@ -1465,6 +1465,8 @@ static int rt2800usb_init_registers(stru rt2x00usb_register_read(rt2x00dev, TX_RTS_CFG, ®); rt2x00_set_field32(®, TX_RTS_CFG_AUTO_RTS_RETRY_LIMIT, 32); @@ -22,7 +20,7 @@ index ff24173..7ec1270 100644 rt2x00_set_field32(®, TX_RTS_CFG_RTS_FBK_EN, 0); rt2x00usb_register_write(rt2x00dev, TX_RTS_CFG, reg); -@@ -2521,7 +2523,10 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2521,7 +2523,10 @@ static int rt2800usb_probe_hw_mode(struc spec->ht.ampdu_factor = 3; spec->ht.ampdu_density = 4; spec->ht.mcs.tx_params = @@ -34,7 +32,7 @@ index ff24173..7ec1270 100644 switch (rt2x00_get_field16(eeprom, EEPROM_ANTENNA_RXPATH)) { case 3: -@@ -2625,6 +2630,21 @@ static int rt2800usb_probe_hw(struct rt2x00_dev *rt2x00dev) +@@ -2625,6 +2630,21 @@ static int rt2800usb_probe_hw(struct rt2 /* * IEEE80211 stack callback functions. */ @@ -56,7 +54,7 @@ index ff24173..7ec1270 100644 static int rt2800usb_set_rts_threshold(struct ieee80211_hw *hw, u32 value) { struct rt2x00_dev *rt2x00dev = hw->priv; -@@ -2754,6 +2774,7 @@ static const struct ieee80211_ops rt2800usb_mac80211_ops = { +@@ -2754,6 +2774,7 @@ static const struct ieee80211_ops rt2800 .configure_filter = rt2x00mac_configure_filter, .set_key = rt2x00mac_set_key, .get_stats = rt2x00mac_get_stats, @@ -64,8 +62,6 @@ index ff24173..7ec1270 100644 .set_rts_threshold = rt2800usb_set_rts_threshold, .bss_info_changed = rt2x00mac_bss_info_changed, .conf_tx = rt2800usb_conf_tx, -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.h b/drivers/net/wireless/rt2x00/rt2800usb.h -index f94c8f8..e4e0a3d 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.h +++ b/drivers/net/wireless/rt2x00/rt2800usb.h @@ -1339,12 +1339,6 @@ struct mac_iveiv_entry { @@ -81,6 +77,3 @@ index f94c8f8..e4e0a3d 100644 * MAC_WCID_ATTRIBUTE: */ #define MAC_WCID_ATTRIBUTE_KEYTAB FIELD32(0x00000001) --- -1.6.0 - diff --git a/package/mac80211/patches/321-rt2x00-Add-support-for-MCS32-rt2800usb.patch b/package/mac80211/patches/321-rt2x00-Add-support-for-MCS32-rt2800usb.patch index ea414eaf9..c8c54a401 100644 --- a/package/mac80211/patches/321-rt2x00-Add-support-for-MCS32-rt2800usb.patch +++ b/package/mac80211/patches/321-rt2x00-Add-support-for-MCS32-rt2800usb.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 7ec1270..25f636f 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -1627,6 +1627,10 @@ static int rt2800usb_init_bbp(struct rt2x00_dev *rt2x00dev) +@@ -1627,6 +1627,10 @@ static int rt2800usb_init_bbp(struct rt2 rt2800usb_bbp_write(rt2x00dev, 73, 0x12); } @@ -23,7 +21,7 @@ index 7ec1270..25f636f 100644 if (rt2x00_rev(&rt2x00dev->chip) == RT3070_VERSION) { rt2800usb_bbp_write(rt2x00dev, 70, 0x0a); rt2800usb_bbp_write(rt2x00dev, 84, 0x99); -@@ -1658,11 +1662,9 @@ static u8 rt2800usb_init_rx_filter(struct rt2x00_dev *rt2x00dev, +@@ -1658,11 +1662,9 @@ static u8 rt2800usb_init_rx_filter(struc rt2800usb_rfcsr_write(rt2x00dev, 24, rfcsr24); @@ -38,7 +36,7 @@ index 7ec1270..25f636f 100644 rt2800usb_rfcsr_read(rt2x00dev, 22, &rfcsr); rt2x00_set_field8(&rfcsr, RFCSR22_BASEBAND_LOOPBACK, 1); -@@ -2535,6 +2537,7 @@ static int rt2800usb_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2535,6 +2537,7 @@ static int rt2800usb_probe_hw_mode(struc spec->ht.mcs.rx_mask[1] = 0xff; case 1: spec->ht.mcs.rx_mask[0] = 0xff; @@ -46,6 +44,3 @@ index 7ec1270..25f636f 100644 break; } --- -1.6.0 - diff --git a/package/mac80211/patches/322-rt2x00-Add-support-for-MCS32-rt2800pci.patch b/package/mac80211/patches/322-rt2x00-Add-support-for-MCS32-rt2800pci.patch index 9063cb52c..ced722589 100644 --- a/package/mac80211/patches/322-rt2x00-Add-support-for-MCS32-rt2800pci.patch +++ b/package/mac80211/patches/322-rt2x00-Add-support-for-MCS32-rt2800pci.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index 6e98c3d..63d6499 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -2484,6 +2484,7 @@ static int rt2800pci_probe_hw_mode(struct rt2x00_dev *rt2x00dev) +@@ -2484,6 +2484,7 @@ static int rt2800pci_probe_hw_mode(struc spec->ht.mcs.rx_mask[1] = 0xff; case 1: spec->ht.mcs.rx_mask[0] = 0xff; @@ -20,6 +18,3 @@ index 6e98c3d..63d6499 100644 break; } --- -1.6.0 - diff --git a/package/mac80211/patches/323-rt2x00-Add-RT3070-detection.patch b/package/mac80211/patches/323-rt2x00-Add-RT3070-detection.patch index 8ff0fad2d..9c186fffc 100644 --- a/package/mac80211/patches/323-rt2x00-Add-RT3070-detection.patch +++ b/package/mac80211/patches/323-rt2x00-Add-RT3070-detection.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index 25f636f..a95ef3c 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -2338,7 +2338,8 @@ static int rt2800usb_init_eeprom(struct rt2x00_dev *rt2x00dev) +@@ -2338,7 +2338,8 @@ static int rt2800usb_init_eeprom(struct * identifies itself as rt2860 in the CSR register. */ if ((rt2x00_get_field32(reg, MAC_CSR0_ASIC_VER) != 0x2860) && @@ -22,6 +20,3 @@ index 25f636f..a95ef3c 100644 ERROR(rt2x00dev, "Invalid RT chipset detected.\n"); return -ENODEV; } --- -1.6.0 - diff --git a/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch b/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch index 954df8de5..929cdbe42 100644 --- a/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch +++ b/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800pci.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c -index 63d6499..9fd6fa2 100644 --- a/drivers/net/wireless/rt2x00/rt2800pci.c +++ b/drivers/net/wireless/rt2x00/rt2800pci.c -@@ -331,7 +331,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -331,7 +331,7 @@ static void rt2800pci_config_wcid_attr(s u32 offset; u32 reg; @@ -21,7 +19,7 @@ index 63d6499..9fd6fa2 100644 rt2x00pci_register_read(rt2x00dev, offset, ®); rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_KEYTAB, -@@ -342,7 +342,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -342,7 +342,7 @@ static void rt2800pci_config_wcid_attr(s rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0); rt2x00pci_register_write(rt2x00dev, offset, reg); @@ -30,7 +28,7 @@ index 63d6499..9fd6fa2 100644 memset(&iveiv_entry, 0, sizeof(iveiv_entry)); if ((crypto->cipher == CIPHER_TKIP) || -@@ -353,7 +353,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -353,7 +353,7 @@ static void rt2800pci_config_wcid_attr(s rt2x00pci_register_multiwrite(rt2x00dev, offset, &iveiv_entry, sizeof(iveiv_entry)); @@ -39,7 +37,7 @@ index 63d6499..9fd6fa2 100644 memset(&wcid_entry, 0, sizeof(wcid_entry)); if (crypto->cmd == SET_KEY) -@@ -393,10 +393,10 @@ static int rt2800pci_config_shared_key(struct rt2x00_dev *rt2x00dev, +@@ -393,10 +393,10 @@ static int rt2800pci_config_shared_key(s * Using the correct defines correctly will cause overhead, * so just calculate the correct offset. */ @@ -52,7 +50,7 @@ index 63d6499..9fd6fa2 100644 rt2x00pci_register_read(rt2x00dev, offset, ®); rt2x00_set_field32(®, field, (crypto->cmd == SET_KEY) * crypto->cipher); -@@ -1813,16 +1813,15 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, +@@ -1813,16 +1813,15 @@ static void rt2800pci_write_tx_desc(stru test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags)); rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size); rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID, @@ -73,7 +71,7 @@ index 63d6499..9fd6fa2 100644 /* * Initialize TX descriptor -@@ -1849,7 +1848,8 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev, +@@ -1849,7 +1848,8 @@ static void rt2800pci_write_tx_desc(stru rt2x00_desc_write(txd, 2, word); rt2x00_desc_read(txd, 3, &word); @@ -83,6 +81,3 @@ index 63d6499..9fd6fa2 100644 rt2x00_set_field32(&word, TXD_W3_QSEL, 2); rt2x00_desc_write(txd, 3, word); } --- -1.6.0 - diff --git a/package/mac80211/patches/325-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch b/package/mac80211/patches/325-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch index eb70b0582..bde32c63e 100644 --- a/package/mac80211/patches/325-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch +++ b/package/mac80211/patches/325-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch @@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> drivers/net/wireless/rt2x00/rt2800usb.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) -diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c -index a95ef3c..b983744 100644 --- a/drivers/net/wireless/rt2x00/rt2800usb.c +++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -358,7 +358,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -358,7 +358,7 @@ static void rt2800usb_config_wcid_attr(s u32 offset; u32 reg; @@ -21,7 +19,7 @@ index a95ef3c..b983744 100644 rt2x00usb_register_read(rt2x00dev, offset, ®); rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_KEYTAB, -@@ -369,7 +369,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -369,7 +369,7 @@ static void rt2800usb_config_wcid_attr(s rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0); rt2x00usb_register_write(rt2x00dev, offset, reg); @@ -30,7 +28,7 @@ index a95ef3c..b983744 100644 memset(&iveiv_entry, 0, sizeof(iveiv_entry)); if ((crypto->cipher == CIPHER_TKIP) || -@@ -380,7 +380,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev, +@@ -380,7 +380,7 @@ static void rt2800usb_config_wcid_attr(s rt2x00usb_register_multiwrite(rt2x00dev, offset, &iveiv_entry, sizeof(iveiv_entry)); @@ -39,7 +37,7 @@ index a95ef3c..b983744 100644 memset(&wcid_entry, 0, sizeof(wcid_entry)); if (crypto->cmd == SET_KEY) -@@ -425,10 +425,10 @@ static int rt2800usb_config_shared_key(struct rt2x00_dev *rt2x00dev, +@@ -425,10 +425,10 @@ static int rt2800usb_config_shared_key(s * Using the correct defines correctly will cause overhead, * so just calculate the correct offset. */ @@ -52,7 +50,7 @@ index a95ef3c..b983744 100644 rt2x00usb_register_read(rt2x00dev, offset, ®); rt2x00_set_field32(®, field, -@@ -2001,16 +2001,16 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, +@@ -2001,16 +2001,16 @@ static void rt2800usb_write_tx_desc(stru rt2x00_set_field32(&word, TXWI_W1_NSEQ, test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags)); rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size); @@ -74,7 +72,7 @@ index a95ef3c..b983744 100644 /* * Initialize TX descriptor -@@ -2018,7 +2018,8 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev, +@@ -2018,7 +2018,8 @@ static void rt2800usb_write_tx_desc(stru rt2x00_desc_read(txi, 0, &word); rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN, skb->len + TXWI_DESC_SIZE); @@ -84,6 +82,3 @@ index a95ef3c..b983744 100644 rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2); rt2x00_set_field32(&word, TXINFO_W0_SW_USE_LAST_ROUND, 0); rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_NEXT_VALID, 0); --- -1.6.0 - diff --git a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch index ea8e2da17..5fe8a3a1f 100644 --- a/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch +++ b/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath9k/main.c +++ b/drivers/net/wireless/ath9k/main.c -@@ -1027,6 +1027,9 @@ static void ath_unregister_led(struct at +@@ -1024,6 +1024,9 @@ static void ath_unregister_led(struct at static void ath_deinit_leds(struct ath_softc *sc) { @@ -10,7 +10,7 @@ cancel_delayed_work_sync(&sc->ath_led_blink_work); ath_unregister_led(&sc->assoc_led); sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; -@@ -1041,6 +1044,9 @@ static void ath_init_leds(struct ath_sof +@@ -1038,6 +1041,9 @@ static void ath_init_leds(struct ath_sof char *trigger; int ret; |