Changeset 26744


Ignore:
Timestamp:
2011-04-20T20:14:35+02:00 (5 years ago)
Author:
nbd
Message:

mac80211: update to wireless-testing 2011-04-19, contains several beacon related fixes for ath9k

Location:
trunk/package/mac80211
Files:
24 deleted
25 edited
6 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r26736 r26744  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2011-04-06 
     13PKG_VERSION:=2011-04-19 
    1414PKG_RELEASE:=3 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 PKG_MD5SUM:=7ef8c2d9ee25af7ed33cf339f2484249 
     16PKG_MD5SUM:=7b789b726927bcc8e3b06c7df40214d9 
    1717 
    1818PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    11981198        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \ 
    11991199        -DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \ 
     1200        -DCONFIG_ATH9K_PCI $(if $(CONFIG_TARGET_ar71xx),-DCONFIG_ATH9K_AHB) \ 
    12001201        $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS -DCONFIG_ATH9K_HTC_DEBUGFS -DCONFIG_ATH5K_DEBUG) \ 
    12011202        $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \ 
     
    12491250        CONFIG_ATH5K_DEBUG=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ 
    12501251        CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ 
     1252        CONFIG_ATH9K_PCI=y \ 
     1253        CONFIG_ATH9K_AHB=$(if $(CONFIG_TARGET_ar71xx),y) \ 
    12511254        CONFIG_ATH9K_HTC=$(if $(CONFIG_PACKAGE_kmod-ath9k-htc),m) \ 
    12521255        CONFIG_ATH9K_HW=$(if $(CONFIG_PACKAGE_kmod-ath9k-common),m) \ 
  • trunk/package/mac80211/patches/001-disable_b44.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -316,8 +316,8 @@ endif #CONFIG_SSB 
     3@@ -311,8 +311,8 @@ endif #CONFIG_SSB 
    44  
    55 CONFIG_P54_PCI=m 
  • trunk/package/mac80211/patches/002-disable_rfkill.patch

    r26506 r26744  
    1010 ifeq ($(CONFIG_MAC80211),y) 
    1111 $(error "ERROR: you have MAC80211 compiled into the kernel, CONFIG_MAC80211=y, as such you cannot replace its mac80211 driver. You need this set to CONFIG_MAC80211=m. If you are using Fedora upgrade your kernel as later version should this set as modular. For further information on Fedora see https://bugzilla.redhat.com/show_bug.cgi?id=470143. If you are using your own kernel recompile it and make mac80211 modular") 
    12 @@ -626,10 +626,10 @@ endif #CONFIG_COMPAT_KERNEL_27 
     12@@ -614,10 +614,10 @@ endif #CONFIG_COMPAT_KERNEL_27 
    1313 # We need the backported rfkill module on kernel < 2.6.31. 
    1414 # In more recent kernel versions use the in kernel rfkill module. 
  • trunk/package/mac80211/patches/005-disable_ssb_build.patch

    r25749 r26744  
    2020 include $(KLIB_BUILD)/.config 
    2121 endif 
    22 @@ -300,19 +299,18 @@ CONFIG_IPW2200_QOS=y 
     22@@ -295,19 +294,18 @@ CONFIG_IPW2200_QOS=y 
    2323 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
    2424 endif #CONFIG_WIRELESS_EXT 
     
    5252 CONFIG_P54_PCI=m 
    5353  
    54 @@ -514,7 +512,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
     54@@ -502,7 +500,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    5555  
    5656 ifdef CONFIG_MMC 
  • trunk/package/mac80211/patches/007-remove_misc_drivers.patch

    r26506 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT 
     3@@ -199,7 +199,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT 
    44 endif #CONFIG_WIRELESS_EXT 
    55  
     
    1010  
    1111 # mac80211 test driver 
    12 @@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T 
     12@@ -337,13 +337,13 @@ endif #CONFIG_CRC_ITU_T 
    1313 CONFIG_MWL8K=m 
    1414  
     
    2929  
    3030 ifdef CONFIG_WIRELESS_EXT 
    31 @@ -403,21 +403,21 @@ endif #CONFIG_COMPAT_KERNEL_29 
     31@@ -398,21 +398,21 @@ endif #CONFIG_COMPAT_KERNEL_29 
    3232 # Note: this depends on CONFIG_USB_NET_RNDIS_HOST and CONFIG_USB_NET_CDCETHER 
    3333 # it also requires new RNDIS_HOST and CDC_ETHER modules which we add 
  • trunk/package/mac80211/patches/010-no_pcmcia.patch

    r25749 r26744  
    1010 include $(KLIB_BUILD)/.config 
    1111 endif 
    12 @@ -234,7 +234,7 @@ CONFIG_B43=m 
     12@@ -229,7 +229,7 @@ CONFIG_B43=m 
    1313 CONFIG_B43_HWRNG=y 
    1414 CONFIG_B43_PCI_AUTOSELECT=y 
  • trunk/package/mac80211/patches/011-no_sdio.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -495,7 +495,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
     3@@ -483,7 +483,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    44  
    55 ifdef CONFIG_MMC 
  • trunk/package/mac80211/patches/013-disable_b43_nphy.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -240,7 +240,7 @@ ifdef CONFIG_MAC80211_LEDS 
     3@@ -235,7 +235,7 @@ ifdef CONFIG_MAC80211_LEDS 
    44 CONFIG_B43_LEDS=y 
    55 endif #CONFIG_MAC80211_LEDS 
  • trunk/package/mac80211/patches/015-remove-rt2x00-options.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -304,7 +304,7 @@ CONFIG_RTL8180=m 
     3@@ -299,7 +299,7 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    1010 CONFIG_RT2500PCI=m 
    1111 ifdef CONFIG_CRC_CCITT 
    12 @@ -444,7 +444,7 @@ CONFIG_RT2800USB=m 
     12@@ -432,7 +432,7 @@ CONFIG_RT2800USB=m 
    1313 # CONFIG_RT2800USB_RT35XX=y 
    1414 CONFIG_RT2800USB_UNKNOWN=y 
  • trunk/package/mac80211/patches/016-remove_pid_algo.patch

    r24948 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -116,7 +116,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y 
     3@@ -111,7 +111,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y 
    44 # This is the one used by our compat-wireless net/mac80211/rate.c 
    55 # in case you have and old kernel which is overriding this to pid. 
  • trunk/package/mac80211/patches/017-remove_ath9k_rc.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -207,7 +207,7 @@ CONFIG_ATH9K_COMMON=m 
     3@@ -202,7 +202,7 @@ CONFIG_ATH9K_COMMON=m 
    44 # as default once we get minstrel properly tested and blessed by 
    55 # our systems engineering team. CCK rates also need to be used 
  • trunk/package/mac80211/patches/019-remove_ath5k_pci_option.patch

    r25749 r26744  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -212,7 +212,7 @@ CONFIG_ATH9K_COMMON=m 
     3@@ -207,7 +207,7 @@ CONFIG_ATH9K_COMMON=m 
    44 # PCI Drivers 
    55 ifdef CONFIG_PCI 
  • trunk/package/mac80211/patches/060-fix_zd1211_defines.patch

    r25965 r26744  
    1111+ 
    1212 /* 8-bit hardware registers */ 
    13  #define CR0   CTL_REG(0x0000) 
    14  #define CR1   CTL_REG(0x0004) 
     13 #define ZD_CR0   CTL_REG(0x0000) 
     14 #define ZD_CR1   CTL_REG(0x0004) 
  • trunk/package/mac80211/patches/110-disable_usb_compat.patch

    r25749 r26744  
    3434--- a/config.mk 
    3535+++ b/config.mk 
    36 @@ -431,7 +431,7 @@ endif #CONFIG_COMPAT_KERNEL_29 
     36@@ -419,7 +419,7 @@ endif #CONFIG_COMPAT_KERNEL_29 
    3737 # This activates a threading fix for usb urb. 
    3838 # this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351 
  • trunk/package/mac80211/patches/404-ath_regd_optional.patch

    r25425 r26744  
    11--- a/drivers/net/wireless/ath/regd.c 
    22+++ b/drivers/net/wireless/ath/regd.c 
    3 @@ -192,6 +192,10 @@ ath_reg_apply_beaconing_flags(struct wip 
     3@@ -193,6 +193,10 @@ ath_reg_apply_beaconing_flags(struct wip 
    44        u32 bandwidth = 0; 
    55        int r; 
     
    1212  
    1313                if (!wiphy->bands[band]) 
    14 @@ -251,6 +255,10 @@ ath_reg_apply_active_scan_flags(struct w 
     14@@ -252,6 +256,10 @@ ath_reg_apply_active_scan_flags(struct w 
    1515        u32 bandwidth = 0; 
    1616        int r; 
     
    2323  
    2424        /* 
    25 @@ -298,6 +306,10 @@ static void ath_reg_apply_radar_flags(st 
     25@@ -299,6 +307,10 @@ static void ath_reg_apply_radar_flags(st 
    2626        struct ieee80211_channel *ch; 
    2727        unsigned int i; 
     
    3434                return; 
    3535  
    36 @@ -464,6 +476,10 @@ ath_regd_init_wiphy(struct ath_regulator 
     36@@ -466,6 +478,10 @@ ath_regd_init_wiphy(struct ath_regulator 
    3737 { 
    3838        const struct ieee80211_regdomain *regd; 
  • trunk/package/mac80211/patches/405-world_regd_fixup.patch

    r25418 r26744  
    6969 }; 
    7070  
    71  /* Can be used by 0x67, 0x6A and 0x68 */ 
    72  static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = { 
     71 /* Can be used by 0x67, 0x68, 0x6A and 0x6C */ 
     72 static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = { 
    7373-       .n_reg_rules = 4, 
    7474        .alpha2 =  "99", 
  • trunk/package/mac80211/patches/406-regd_no_assoc_hints.patch

    r26723 r26744  
    11--- a/net/wireless/reg.c 
    22+++ b/net/wireless/reg.c 
    3 @@ -1629,6 +1629,8 @@ void regulatory_hint_11d(struct wiphy *w 
     3@@ -1644,6 +1644,8 @@ void regulatory_hint_11d(struct wiphy *w 
    44        enum environment_cap env = ENVIRON_ANY; 
    55        struct regulatory_request *request; 
     
    1010  
    1111        if (unlikely(!last_request)) 
    12 @@ -1791,6 +1793,8 @@ static void restore_regulatory_settings( 
     12@@ -1850,6 +1852,8 @@ static void restore_regulatory_settings( 
    1313  
    1414 void regulatory_hint_disconnect(void) 
  • trunk/package/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch

    r26668 r26744  
    11--- a/drivers/net/wireless/ath/ath9k/main.c 
    22+++ b/drivers/net/wireless/ath/ath9k/main.c 
    3 @@ -1483,14 +1483,6 @@ static int ath9k_add_interface(struct ie 
     3@@ -1439,15 +1439,6 @@ static int ath9k_add_interface(struct ie 
    44                } 
    55        } 
    66  
    7 -       if ((vif->type == NL80211_IFTYPE_ADHOC) && 
    8 -           sc->nvifs > 0) { 
     7-       if ((ah->opmode == NL80211_IFTYPE_ADHOC) || 
     8-           ((vif->type == NL80211_IFTYPE_ADHOC) && 
     9-            sc->nvifs > 0)) { 
    910-               ath_err(common, "Cannot create ADHOC interface when other" 
    1011-                       " interfaces already exist.\n"); 
     
    1617                "Attach a VIF of type: %d\n", vif->type); 
    1718  
     19@@ -1473,15 +1464,6 @@ static int ath9k_change_interface(struct 
     20        mutex_lock(&sc->mutex); 
     21        ath9k_ps_wakeup(sc); 
     22  
     23-       /* See if new interface type is valid. */ 
     24-       if ((new_type == NL80211_IFTYPE_ADHOC) && 
     25-           (sc->nvifs > 1)) { 
     26-               ath_err(common, "When using ADHOC, it must be the only" 
     27-                       " interface.\n"); 
     28-               ret = -EINVAL; 
     29-               goto out; 
     30-       } 
     31- 
     32        if (ath9k_uses_beacons(new_type) && 
     33            !ath9k_uses_beacons(vif->type)) { 
     34                if (sc->nbcnvifs >= ATH_BCBUF) { 
  • trunk/package/mac80211/patches/411-ath5k_allow_adhoc_and_ap.patch

    r26685 r26744  
    1919--- a/drivers/net/wireless/ath/ath5k/base.c 
    2020+++ b/drivers/net/wireless/ath/ath5k/base.c 
    21 @@ -1857,7 +1857,7 @@ ath5k_beacon_send(struct ath5k_softc *sc 
     21@@ -1880,7 +1880,7 @@ ath5k_beacon_send(struct ath5k_softc *sc 
    2222                sc->bmisscount = 0; 
    2323        } 
     
    2828                u64 tsf = ath5k_hw_get_tsf64(ah); 
    2929                u32 tsftu = TSF_TO_TU(tsf); 
    30 @@ -1935,7 +1935,7 @@ ath5k_beacon_update_timers(struct ath5k_ 
     30@@ -1958,7 +1958,7 @@ ath5k_beacon_update_timers(struct ath5k_ 
    3131        u64 hw_tsf; 
    3232  
  • trunk/package/mac80211/patches/500-ath9k_eeprom_debugfs.patch

    r26273 r26744  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -1077,6 +1077,53 @@ static const struct file_operations fops 
     3@@ -1115,6 +1115,53 @@ static const struct file_operations fops 
    44        .llseek = default_llseek,/* read accesses f_pos */ 
    55 }; 
     
    5555 { 
    5656        struct ath_common *common = ath9k_hw_common(ah); 
    57 @@ -1125,6 +1172,9 @@ int ath9k_init_debug(struct ath_hw *ah) 
     57@@ -1163,6 +1210,9 @@ int ath9k_init_debug(struct ath_hw *ah) 
    5858        debugfs_create_u32("gpio_val", S_IRUSR | S_IWUSR, 
    5959                           sc->debug.debugfs_phy, &sc->sc_ah->gpio_val); 
  • trunk/package/mac80211/patches/510-ath9k_intr_mitigation_tweak.patch

    r26532 r26744  
    11--- a/drivers/net/wireless/ath/ath9k/hw.c 
    22+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    3 @@ -1437,8 +1437,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     3@@ -1450,8 +1450,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    44        REG_WRITE(ah, AR_OBS, 8); 
    55  
  • trunk/package/mac80211/patches/511-ath9k_increase_bcbuf.patch

    r26506 r26744  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -361,7 +361,7 @@ struct ath_vif { 
     3@@ -367,7 +367,7 @@ struct ath_vif { 
    44  * number of beacon intervals, the game's up. 
    55  */ 
  • trunk/package/mac80211/patches/541-mac80211_fix_iftype_wds.patch

    r26743 r26744  
    11--- a/net/mac80211/rx.c 
    22+++ b/net/mac80211/rx.c 
    3 @@ -2328,13 +2328,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ 
     3@@ -2330,13 +2330,14 @@ ieee80211_rx_h_mgmt(struct ieee80211_rx_ 
    44  
    55        if (!ieee80211_vif_is_mesh(&sdata->vif) && 
     
    1818        case cpu_to_le16(IEEE80211_STYPE_DEAUTH): 
    1919        case cpu_to_le16(IEEE80211_STYPE_DISASSOC): 
    20 @@ -2714,7 +2715,10 @@ static int prepare_for_handlers(struct i 
     20@@ -2716,7 +2717,10 @@ static int prepare_for_handlers(struct i 
    2121                } 
    2222                break; 
  • trunk/package/mac80211/patches/542-mac80211_enable_iftype_wds_aggregation.patch

    r26743 r26744  
    3434--- a/net/mac80211/rx.c 
    3535+++ b/net/mac80211/rx.c 
    36 @@ -2130,7 +2130,8 @@ ieee80211_rx_h_action(struct ieee80211_r 
     36@@ -2132,7 +2132,8 @@ ieee80211_rx_h_action(struct ieee80211_r 
    3737                 */ 
    3838                if (sdata->vif.type != NL80211_IFTYPE_STATION && 
     
    4444  
    4545                /* verify action_code is present */ 
    46 @@ -2715,13 +2716,16 @@ static int prepare_for_handlers(struct i 
     46@@ -2717,13 +2718,16 @@ static int prepare_for_handlers(struct i 
    4747                } 
    4848                break; 
  • trunk/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch

    r26506 r26744  
    11--- a/drivers/net/wireless/rt2x00/rt2x00pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c 
    3 @@ -199,6 +199,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
     3@@ -208,6 +208,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
    44 } 
    55 EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize); 
     
    99  * PCI driver handlers. 
    1010  */ 
    11 @@ -375,6 +376,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
     11@@ -383,6 +384,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
    1212 } 
    1313 EXPORT_SYMBOL_GPL(rt2x00pci_resume); 
  • trunk/package/mac80211/patches/610-set_pci_mwi.patch

    r26506 r26744  
    11--- a/drivers/net/wireless/rt2x00/rt2x00pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c 
    3 @@ -264,8 +264,10 @@ int rt2x00pci_probe(struct pci_dev *pci_ 
     3@@ -272,8 +272,10 @@ int rt2x00pci_probe(struct pci_dev *pci_ 
    44  
    55        pci_set_master(pci_dev); 
  • trunk/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch

    r26273 r26744  
    11--- a/drivers/net/wireless/mwl8k.c 
    22+++ b/drivers/net/wireless/mwl8k.c 
    3 @@ -5111,6 +5111,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
     3@@ -5165,6 +5165,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
    44 MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); 
    55  
Note: See TracChangeset for help on using the changeset viewer.