Changeset 24678


Ignore:
Timestamp:
2010-12-18T19:37:58+01:00 (7 years ago)
Author:
nbd
Message:

mac80211: sync latest version from trunk - improves stability and performance

Location:
branches/backfire/package/mac80211
Files:
5 added
8 deleted
13 edited
2 moved

Legend:

Unmodified
Added
Removed
  • branches/backfire/package/mac80211/Makefile

    r24505 r24678  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2010-12-09 
     13PKG_VERSION:=2010-12-16 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 #       http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \ 
    17 #       http://wireless.kernel.org/download/compat-wireless-2.6 
    18 PKG_MD5SUM:=94b6eaaa2c8245d1b5d6b6f16b75a701 
     16PKG_MD5SUM:=39196307aa67c1f19f498b570b994112 
    1917 
    2018PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    4442  $(call KernelPackage/mac80211/Default) 
    4543  TITLE:=cfg80211 - wireless configuration API 
    46   DEPENDS+= +wireless-tools +iw @!LINUX_2_6_25 @!LINUX_2_4 +crda 
     44  DEPENDS+= +wireless-tools +iw +crda 
    4745ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
    4846  FILES:= \ 
     
    575573 Includes: 
    576574 - ipw2200 
     575endef 
     576 
     577 
     578define KernelPackage/net-hermes 
     579  $(call KernelPackage/mac80211/Default) 
     580  TITLE:=Hermes 802.11b chipset support 
     581  DEPENDS:=@PCI_SUPPORT||PCMCIA_SUPPORT +kmod-cfg80211 
     582  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco.ko 
     583  AUTOLOAD:=$(call AutoLoad,50,orinoco) 
     584endef 
     585 
     586define KernelPackage/net-hermes/description 
     587 Kernel support for Hermes 802.11b chipsets 
     588endef 
     589 
     590define KernelPackage/net-hermes-pci 
     591  $(call KernelPackage/mac80211/Default) 
     592  TITLE:=Intersil Prism 2.5 PCI support 
     593  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     594  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_pci.ko 
     595  AUTOLOAD:=$(call AutoLoad,55,orinoco_pci) 
     596endef 
     597 
     598define KernelPackage/net-hermes-pci/description 
     599 Kernel modules for Intersil Prism 2.5 PCI support 
     600endef 
     601 
     602define KernelPackage/net-hermes-plx 
     603  $(call KernelPackage/mac80211/Default) 
     604  TITLE:=PLX9052 based PCI adaptor 
     605  DEPENDS:=@PCI_SUPPORT +kmod-net-hermes +kmod-cfg80211 
     606  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_plx.ko 
     607  AUTOLOAD:=$(call AutoLoad,55,orinoco_plx) 
     608endef 
     609 
     610define KernelPackage/net-hermes-plx/description 
     611 Kernel modules for Hermes in PLX9052 based PCI adaptors 
     612endef 
     613 
     614define KernelPackage/net-hermes-pcmcia 
     615  $(call KernelPackage/mac80211/Default) 
     616  TITLE:=Hermes based PCMCIA adaptors 
     617  DEPENDS:=@PCMCIA_SUPPORT +kmod-net-hermes +kmod-cfg80211 @BROKEN 
     618  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/orinoco/orinoco_cs.ko 
     619  AUTOLOAD:=$(call AutoLoad,55,orinoco_cs) 
     620endef 
     621 
     622define KernelPackage/net-hermes-pcmcia/description 
     623 Kernel modules for Hermes based PCMCIA adaptors 
    577624endef 
    578625 
     
    925972        CONFIG_WL12XX= \ 
    926973        CONFIG_EEPROM_93CX6= \ 
    927         CONFIG_HERMES= \ 
     974        CONFIG_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes),m) \ 
     975        CONFIG_HERMES_CACHE_FW_ON_INIT= \ 
     976        CONFIG_PCI_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-pci),m) \ 
     977        CONFIG_PLX_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-plx),m) \ 
     978        CONFIG_PCMCIA_HERMES=$(if $(CONFIG_PACKAGE_kmod-net-hermes-pcmcia),m) \ 
     979        CONFIG_HERMES_PRISM= \ 
     980        CONFIG_APPLE_AIRPORT= \ 
     981        CONFIG_TMD_HERMES= \ 
     982        CONFIG_NORTEL_HERMES= \ 
     983        CONFIG_PCMCIA_SPECTRUM= \ 
     984        CONFIG_ORINOCO_USB= \ 
    928985        CONFIG_AR9170_USB=$(if $(CONFIG_PACKAGE_kmod-ar9170),m) \ 
    929986        CONFIG_AR9170_LEDS=$(CONFIG_LEDS_TRIGGERS) \ 
     
    11301187$(eval $(call KernelPackage,net-ipw2200)) 
    11311188$(eval $(call KernelPackage,mwl8k)) 
     1189$(eval $(call KernelPackage,net-hermes)) 
     1190$(eval $(call KernelPackage,net-hermes-pci)) 
     1191$(eval $(call KernelPackage,net-hermes-plx)) 
     1192$(eval $(call KernelPackage,net-hermes-pcmcia)) 
  • branches/backfire/package/mac80211/patches/008-led_default.patch

    r24505 r24678  
    1717+# CONFIG_B43_LEDS=y 
    1818 CONFIG_B43_PHY_LP=y 
    19  CONFIG_B43_NPHY=y 
     19 CONFIG_B43_PHY_N=y 
    2020 # CONFIG_B43_FORCE_PIO=y 
    21 @@ -251,7 +251,7 @@ CONFIG_B43_NPHY=y 
     21@@ -251,7 +251,7 @@ CONFIG_B43_PHY_N=y 
    2222 CONFIG_B43LEGACY=m 
    2323 CONFIG_B43LEGACY_HWRNG=y 
  • branches/backfire/package/mac80211/patches/013-disable_b43_nphy.patch

    r24505 r24678  
    55 # CONFIG_B43_LEDS=y 
    66 CONFIG_B43_PHY_LP=y 
    7 -CONFIG_B43_NPHY=y 
    8 +# CONFIG_B43_NPHY is not set 
     7-CONFIG_B43_PHY_N=y 
     8+# CONFIG_B43_PHY_N=y 
    99 # CONFIG_B43_FORCE_PIO=y 
    1010 # CONFIG_B43_DEBUG=y 
  • branches/backfire/package/mac80211/patches/300-ath9k_gpio_settings.patch

    r24505 r24678  
    1616--- a/drivers/net/wireless/ath/ath9k/hw.h 
    1717+++ b/drivers/net/wireless/ath/ath9k/hw.h 
    18 @@ -795,6 +795,8 @@ struct ath_hw { 
     18@@ -788,6 +788,8 @@ struct ath_hw { 
    1919        int initPDADC; 
    2020        int PDADCdelta; 
     
    4848 { 
    4949        int count = 50; 
    50 @@ -1457,6 +1471,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     50@@ -1459,6 +1473,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    5151        if (AR_SREV_9300_20_OR_LATER(ah)) 
    5252                ar9003_hw_bb_watchdog_config(ah); 
  • branches/backfire/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

    r24505 r24678  
    99  
    1010 #include "hw.h" 
    11 @@ -436,8 +437,16 @@ static int ath9k_hw_init_macaddr(struct  
     11@@ -428,8 +429,16 @@ static int ath9k_hw_init_macaddr(struct  
    1212                common->macaddr[2 * i] = eeval >> 8; 
    1313                common->macaddr[2 * i + 1] = eeval & 0xff; 
  • branches/backfire/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r24505 r24678  
    1919 #include "ath9k.h" 
    2020  
    21 @@ -522,6 +523,7 @@ static void ath9k_init_misc(struct ath_s 
     21@@ -526,6 +527,7 @@ static void ath9k_init_misc(struct ath_s 
    2222 static int ath9k_init_softc(u16 devid, struct ath_softc *sc, u16 subsysid, 
    2323                            const struct ath_bus_ops *bus_ops) 
     
    2727        struct ath_common *common; 
    2828        int ret = 0, i; 
    29 @@ -535,7 +537,7 @@ static int ath9k_init_softc(u16 devid, s 
     29@@ -539,7 +541,7 @@ static int ath9k_init_softc(u16 devid, s 
    3030        ah->hw_version.subsysid = subsysid; 
    3131        sc->sc_ah = ah; 
     
    3636  
    3737        common = ath9k_hw_common(ah); 
    38 @@ -568,6 +570,9 @@ static int ath9k_init_softc(u16 devid, s 
     38@@ -572,6 +574,9 @@ static int ath9k_init_softc(u16 devid, s 
    3939        if (ret) 
    4040                goto err_hw; 
  • branches/backfire/package/mac80211/patches/409-ath9k_platform_settings.patch

    r24505 r24678  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -537,8 +537,14 @@ static int ath9k_init_softc(u16 devid, s 
     3@@ -541,8 +541,14 @@ static int ath9k_init_softc(u16 devid, s 
    44        ah->hw_version.subsysid = subsysid; 
    55        sc->sc_ah = ah; 
     
    1919--- a/drivers/net/wireless/ath/ath9k/hw.h 
    2020+++ b/drivers/net/wireless/ath/ath9k/hw.h 
    21 @@ -794,7 +794,7 @@ struct ath_hw { 
     21@@ -786,7 +786,7 @@ struct ath_hw { 
    2222        u32 originalGain[22]; 
    2323        int initPDADC; 
  • branches/backfire/package/mac80211/patches/510-ath9k_led_cleanup.patch

    r24505 r24678  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -438,26 +438,20 @@ void ath9k_btcoex_timer_pause(struct ath 
     3@@ -441,26 +441,20 @@ void ath9k_btcoex_timer_pause(struct ath 
    44  
    55 #define ATH_LED_PIN_DEF                1 
     
    3939 /* Antenna diversity/combining */ 
    4040 #define ATH_ANT_RX_CURRENT_SHIFT 4 
    41 @@ -608,15 +602,11 @@ struct ath_softc { 
     41@@ -611,15 +605,11 @@ struct ath_softc { 
    4242        struct ath_beacon beacon; 
    4343        struct ieee80211_supported_band sbands[IEEE80211_NUM_BANDS]; 
     
    254254--- a/drivers/net/wireless/ath/ath9k/main.c 
    255255+++ b/drivers/net/wireless/ath/ath9k/main.c 
    256 @@ -1275,9 +1275,6 @@ static void ath9k_stop(struct ieee80211_ 
     256@@ -1295,9 +1295,6 @@ static void ath9k_stop(struct ieee80211_ 
    257257  
    258258        aphy->state = ATH_WIPHY_INACTIVE; 
     
    266266--- a/drivers/net/wireless/ath/ath9k/init.c 
    267267+++ b/drivers/net/wireless/ath/ath9k/init.c 
    268 @@ -139,6 +139,21 @@ static struct ieee80211_rate ath9k_legac 
     268@@ -143,6 +143,21 @@ static struct ieee80211_rate ath9k_legac 
    269269        RATE(540, 0x0c, 0), 
    270270 }; 
     
    288288  
    289289 /* 
    290 @@ -742,6 +757,12 @@ int ath9k_init_device(u16 devid, struct  
     290@@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct  
    291291  
    292292        ath9k_init_txpower_limits(sc); 
     
    295295+       /* must be initialized before ieee80211_register_hw */ 
    296296+       sc->led_cdev.default_trigger = ieee80211_create_tpt_led_trigger(sc->hw, 
    297 +               ath9k_tpt_blink, ARRAY_SIZE(ath9k_tpt_blink)); 
     297+               IEEE80211_TPT_LEDTRIG_FL_RADIO, ath9k_tpt_blink, 
     298+               ARRAY_SIZE(ath9k_tpt_blink)); 
    298299+#endif 
    299300+ 
  • branches/backfire/package/mac80211/patches/531-ath9k_legacy_chainmask_fix.patch

    r24659 r24678  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -662,7 +662,6 @@ void ath9k_deinit_device(struct ath_soft 
     3@@ -665,7 +665,6 @@ void ath9k_deinit_device(struct ath_soft 
    44 void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw); 
    55 void ath9k_update_ichannel(struct ath_softc *sc, struct ieee80211_hw *hw, 
     
    1111--- a/drivers/net/wireless/ath/ath9k/main.c 
    1212+++ b/drivers/net/wireless/ath/ath9k/main.c 
    13 @@ -522,32 +522,6 @@ set_timer: 
     13@@ -538,32 +538,6 @@ set_timer: 
    1414        } 
    1515 } 
     
    4444 { 
    4545        struct ath_node *an; 
    46 @@ -1609,8 +1583,6 @@ static int ath9k_config(struct ieee80211 
     46@@ -1676,8 +1650,6 @@ static int ath9k_config(struct ieee80211 
    4747                /* XXX: remove me eventualy */ 
    4848                ath9k_update_ichannel(sc, hw, &sc->sc_ah->channels[pos]); 
     
    5353                spin_lock_irqsave(&common->cc_lock, flags); 
    5454                ath_update_survey_stats(sc); 
    55 @@ -1842,10 +1814,6 @@ static void ath9k_bss_info_changed(struc 
     55@@ -1909,10 +1881,6 @@ static void ath9k_bss_info_changed(struc 
    5656                /* Set aggregation protection mode parameters */ 
    5757                sc->config.ath_aggr_prot = 0; 
  • branches/backfire/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch

    r23107 r24678  
    11--- a/drivers/net/wireless/rt2x00/rt2x00pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c 
    3 @@ -202,6 +202,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
     3@@ -209,6 +209,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
    44 } 
    55 EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize); 
     
    99  * PCI driver handlers. 
    1010  */ 
    11 @@ -381,6 +382,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
     11@@ -388,6 +389,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
    1212 } 
    1313 EXPORT_SYMBOL_GPL(rt2x00pci_resume); 
  • branches/backfire/package/mac80211/patches/601-rt2x00-fix-hang-on-ifdown.patch

    r24505 r24678  
    1717--- a/drivers/net/wireless/rt2x00/rt2800pci.c 
    1818+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 
    19 @@ -592,6 +592,10 @@ static void rt2800pci_kill_tx_queue(stru 
    20                 return; 
    21         } 
     19@@ -481,6 +481,10 @@ static void rt2800pci_disable_radio(stru 
     20  
     21        rt2800_register_write(rt2x00dev, PBF_SYS_CTRL, 0x00001280); 
    2222  
    2323+       rt2800_register_read(rt2x00dev, WPDMA_GLO_CFG, &reg); 
     
    2626+ 
    2727        rt2800_register_read(rt2x00dev, WPDMA_RST_IDX, &reg); 
    28         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, (queue->qid == QID_AC_BE)); 
    29         rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, (queue->qid == QID_AC_BK)); 
     28        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX0, 1); 
     29        rt2x00_set_field32(&reg, WPDMA_RST_IDX_DTX_IDX1, 1); 
  • branches/backfire/package/mac80211/patches/610-set_pci_mwi.patch

    r22391 r24678  
    11--- a/drivers/net/wireless/rt2x00/rt2x00pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c 
    3 @@ -270,8 +270,10 @@ int rt2x00pci_probe(struct pci_dev *pci_ 
     3@@ -277,8 +277,10 @@ int rt2x00pci_probe(struct pci_dev *pci_ 
    44  
    55        pci_set_master(pci_dev); 
  • branches/backfire/package/mac80211/patches/800-b43-gpio-mask-module-option.patch

    r24505 r24678  
    2323 module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444); 
    2424 MODULE_PARM_DESC(bad_frames_preempt, 
    25 @@ -2540,10 +2545,10 @@ static int b43_gpio_init(struct b43_wlde 
     25@@ -2536,10 +2541,10 @@ static int b43_gpio_init(struct b43_wlde 
    2626                    & ~B43_MACCTL_GPOUTSMSK); 
    2727  
     
    3636                mask |= 0x0060; 
    3737                set |= 0x0060; 
    38 @@ -5100,10 +5105,10 @@ static void b43_print_driverinfo(void) 
     38@@ -5096,10 +5101,10 @@ static void b43_print_driverinfo(void) 
    3939        feat_sdio = "S"; 
    4040 #endif 
  • branches/backfire/package/mac80211/patches/810-b43_no_pio.patch

    r24505 r24678  
    1212--- a/drivers/net/wireless/b43/main.c 
    1313+++ b/drivers/net/wireless/b43/main.c 
    14 @@ -1816,9 +1816,11 @@ static void b43_do_interrupt_thread(stru 
     14@@ -1812,9 +1812,11 @@ static void b43_do_interrupt_thread(stru 
    1515                               dma_reason[4], dma_reason[5]); 
    1616                        b43err(dev->wl, "This device does not support DMA " 
Note: See TracChangeset for help on using the changeset viewer.