Changeset 21803 for branches/backfire


Ignore:
Timestamp:
2010-06-14T20:35:47+02:00 (6 years ago)
Author:
nbd
Message:

[backfire] backport mac80211 updates from trunk

Location:
branches/backfire/package/mac80211
Files:
4 added
4 deleted
17 edited
1 moved

Legend:

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

    r21649 r21803  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2010-05-24 
     13PKG_VERSION:=2010-06-10 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    1616#       http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \ 
    1717#       http://wireless.kernel.org/download/compat-wireless-2.6 
    18 PKG_MD5SUM:=3d465dc6e0213964d0349f61c485817f 
     18PKG_MD5SUM:=4074469689f7a5a0d2e038f2b5dad0bb 
    1919 
    2020PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    778778        -DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \ 
    779779        $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS) \ 
    780         $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG) \ 
     780        $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \ 
    781781        -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ 
    782782        -DCONFIG_MAC80211_RC_MINSTREL_HT \ 
     
    801801        $(foreach opt,$(CONFOPTS),CONFIG_$(opt)=m) \ 
    802802        CONFIG_MAC80211=$(if $(CONFIG_PACKAGE_kmod-mac80211),m) \ 
    803         CONFIG_MAC80211_RC_PID=y \ 
    804803        CONFIG_MAC80211_RC_MINSTREL=y \ 
    805804        CONFIG_MAC80211_LEDS=$(CONFIG_LEDS_TRIGGERS) \ 
     
    816815        CONFIG_ATH_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath),m) \ 
    817816        CONFIG_ATH_DEBUG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ 
     817        CONFIG_ATH9K_PKTLOG=$(if $(CONFIG_PACKAGE_ATH_DEBUG),y) \ 
    818818        CONFIG_ATH5K=$(if $(CONFIG_PACKAGE_kmod-ath5k),m) \ 
    819819        CONFIG_ATH9K=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ 
     
    988988        tar xjf "$(DL_DIR)/$(PKG_B43_FWCUTTER_SOURCE)" -C "$(PKG_BUILD_DIR)" 
    989989        $(MAKE) -C "$(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)" \ 
    990                 CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h" 
     990                CFLAGS="-I$(STAGING_DIR_HOST)/include -include endian.h" \ 
     991                QUIET_SPARSE=: 
    991992        $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_B43_FWCUTTER_OBJECT)/b43-fwcutter $(STAGING_DIR_HOST)/bin/ 
    992993ifeq ($(CONFIG_B43_OPENFIRMWARE),y) 
  • branches/backfire/package/mac80211/patches/001-disable_b44.patch

    r21354 r21803  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -256,8 +256,8 @@ endif 
     3@@ -257,8 +257,8 @@ endif 
    44  
    55 CONFIG_P54_PCI=m 
  • branches/backfire/package/mac80211/patches/002-disable_rfkill.patch

    r21649 r21803  
    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 @@ -483,8 +483,8 @@ endif 
     12@@ -488,8 +488,8 @@ endif 
    1313 # We need the backported rfkill module on kernel < 2.6.31. 
    1414 # In more recent kernel versions use the in kernel rfkill module. 
  • branches/backfire/package/mac80211/patches/005-disable_ssb_build.patch

    r21649 r21803  
    2020 include $(KLIB_BUILD)/.config 
    2121 endif 
    22 @@ -239,21 +238,6 @@ CONFIG_IPW2200_QOS=y 
     22@@ -240,21 +239,6 @@ CONFIG_IPW2200_QOS=y 
    2323 # 
    2424 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
     
    4242  
    4343 # CONFIG_B44=m 
    44 @@ -413,7 +397,6 @@ endif # end of SPI driver list 
     44@@ -418,7 +402,6 @@ endif # end of SPI driver list 
    4545  
    4646 ifneq ($(CONFIG_MMC),) 
  • branches/backfire/package/mac80211/patches/007-remove_misc_drivers.patch

    r21558 r21803  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -270,10 +270,10 @@ endif 
     3@@ -271,13 +271,13 @@ endif 
    44 CONFIG_MWL8K=m 
    55  
     
    88-CONFIG_ATL2=m 
    99-CONFIG_ATL1E=m 
    10 -CONFIG_ATL1C=m 
    1110+# CONFIG_ATL1=m 
    1211+# CONFIG_ATL2=m 
    1312+# CONFIG_ATL1E=m 
     13 ifdef CONFIG_COMPAT_KERNEL_27 
     14-CONFIG_ATL1C=n 
     15+# CONFIG_ATL1C=n 
     16 else 
     17-CONFIG_ATL1C=m 
    1418+# CONFIG_ATL1C=m 
     19 endif 
    1520  
    1621 CONFIG_HERMES=m 
    17  CONFIG_HERMES_CACHE_FW_ON_INIT=y 
    18 @@ -326,10 +326,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
     22@@ -331,10 +331,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
    1923 CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n 
    2024 CONFIG_USB_NET_COMPAT_CDCETHER=n 
  • branches/backfire/package/mac80211/patches/010-no_pcmcia.patch

    r21558 r21803  
    1010 include $(KLIB_BUILD)/.config 
    1111 endif 
    12 @@ -180,7 +180,7 @@ CONFIG_B43=m 
     12@@ -181,7 +181,7 @@ CONFIG_B43=m 
    1313 CONFIG_B43_HWRNG=y 
    1414 CONFIG_B43_PCI_AUTOSELECT=y 
  • branches/backfire/package/mac80211/patches/011-no_sdio.patch

    r21649 r21803  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -382,7 +382,7 @@ endif # end of SPI driver list 
     3@@ -387,7 +387,7 @@ endif # end of SPI driver list 
    44  
    55 ifneq ($(CONFIG_MMC),) 
  • branches/backfire/package/mac80211/patches/013-disable_b43_nphy.patch

    r21558 r21803  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -184,7 +184,7 @@ ifneq ($(CONFIG_PCMCIA),) 
     3@@ -185,7 +185,7 @@ ifneq ($(CONFIG_PCMCIA),) 
    44 endif 
    55 CONFIG_B43_LEDS=y 
  • branches/backfire/package/mac80211/patches/015-remove-rt2x00-options.patch

    r21558 r21803  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -232,12 +232,12 @@ CONFIG_RTL8180=m 
     3@@ -233,12 +233,12 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    1616 # CONFIG_RT2800PCI_RT35XX=y 
    1717 # CONFIG_RT2800PCI_SOC=y 
    18 @@ -339,7 +339,7 @@ CONFIG_RT2800USB=m 
    19  # CONFIG_RT2800USB_RT35XX=y 
    20  # CONFIG_RT2800USB_UNKNOWN=y 
     18@@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y 
     19 CONFIG_RT2800USB_RT35XX=y 
     20 CONFIG_RT2800USB_UNKNOWN=y 
    2121 endif 
    2222-CONFIG_RT2X00_LIB_USB=m 
  • branches/backfire/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch

    r21649 r21803  
    11--- a/drivers/net/wireless/ath/ath5k/reset.c 
    22+++ b/drivers/net/wireless/ath/ath5k/reset.c 
    3 @@ -1374,10 +1374,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah,  
     3@@ -1334,10 +1334,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah,  
    44         * guess we can tweak it and see how it goes ;-) 
    55         */ 
  • branches/backfire/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

    r21354 r21803  
    99  
    1010 #include "hw.h" 
    11 @@ -456,8 +457,16 @@ static int ath9k_hw_init_macaddr(struct  
     11@@ -450,8 +451,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/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

    r21354 r21803  
    1111--- a/drivers/net/wireless/ath/ath9k/init.c 
    1212+++ b/drivers/net/wireless/ath/ath9k/init.c 
    13 @@ -565,6 +565,7 @@ static int ath9k_init_softc(u16 devid, s 
     13@@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s 
    1414 { 
    1515        struct ath_hw *ah = NULL; 
     
    1919        int csz = 0; 
    2020  
    21 @@ -576,6 +577,10 @@ static int ath9k_init_softc(u16 devid, s 
     21@@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s 
    2222        ah->hw_version.subsysid = subsysid; 
    2323        sc->sc_ah = ah; 
     
    3232--- a/drivers/net/wireless/ath/ath9k/hw.c 
    3333+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    34 @@ -429,10 +429,6 @@ static void ath9k_hw_init_defaults(struc 
     34@@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc 
    3535        ah->hw_version.magic = AR5416_MAGIC; 
    3636        ah->hw_version.subvendorid = 0; 
  • branches/backfire/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r21354 r21803  
    1212 #include "hw-ops.h" 
    1313 #include "rc.h" 
    14 @@ -441,18 +443,23 @@ static void ath9k_hw_init_defaults(struc 
     14@@ -435,18 +437,23 @@ static void ath9k_hw_init_defaults(struc 
    1515 static int ath9k_hw_init_macaddr(struct ath_hw *ah) 
    1616 { 
  • branches/backfire/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch

    r21649 r21803  
    11--- a/drivers/net/wireless/ath/ath9k/hw.c 
    22+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    3 @@ -1400,7 +1400,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     3@@ -1398,7 +1398,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    44  
    55        if (ah->config.rx_intr_mitigation) { 
  • branches/backfire/package/mac80211/patches/409-ath9k-add-wndr3700-antenna-initialization.patch

    r21354 r21803  
    99  
    1010 static char *dev_info = "ath9k"; 
    11 @@ -580,6 +581,8 @@ static int ath9k_init_softc(u16 devid, s 
     11@@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s 
    1212        pdata = (struct ath9k_platform_data *) sc->dev->platform_data; 
    1313        if (!pdata) 
     
    1818        common = ath9k_hw_common(ah); 
    1919        common->ops = &ath9k_common_ops; 
    20 @@ -702,6 +705,24 @@ void ath9k_set_hw_capab(struct ath_softc 
     20@@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc 
    2121        SET_IEEE80211_PERM_ADDR(hw, common->macaddr); 
    2222 } 
     
    4343                    const struct ath_bus_ops *bus_ops) 
    4444 { 
    45 @@ -720,6 +741,9 @@ int ath9k_init_device(u16 devid, struct  
     45@@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct  
    4646        common = ath9k_hw_common(ah); 
    4747        ath9k_set_hw_capab(sc, hw); 
     
    5555--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    5656+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    57 @@ -517,6 +517,8 @@ struct ath_softc { 
     57@@ -583,6 +583,8 @@ struct ath_softc { 
    5858  
    5959        int beacon_interval; 
  • branches/backfire/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch

    r21354 r21803  
    1414--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    1515+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    16 @@ -392,6 +392,7 @@ void ath9k_btcoex_timer_pause(struct ath 
     16@@ -458,6 +458,7 @@ void ath9k_btcoex_timer_pause(struct ath 
    1717  
    1818 #define ATH_LED_PIN_DEF                1 
  • branches/backfire/package/mac80211/patches/500-ath9k_use_minstrel.patch

    r21802 r21803  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -689,7 +689,11 @@ void ath9k_set_hw_capab(struct ath_softc 
     3@@ -677,7 +677,11 @@ void ath9k_set_hw_capab(struct ath_softc 
    44        hw->sta_data_size = sizeof(struct ath_node); 
    55        hw->vif_data_size = sizeof(struct ath_vif); 
  • branches/backfire/package/mac80211/patches/600-rt2x00-disable-pci-code-if-CONFIG_PCI-not-defined.patch

    r21649 r21803  
    11--- a/drivers/net/wireless/rt2x00/rt2x00pci.c 
    22+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c 
    3 @@ -216,6 +216,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
     3@@ -262,6 +262,7 @@ void rt2x00pci_uninitialize(struct rt2x0 
    44 } 
    55 EXPORT_SYMBOL_GPL(rt2x00pci_uninitialize); 
     
    99  * PCI driver handlers. 
    1010  */ 
    11 @@ -390,6 +391,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
     11@@ -439,6 +440,7 @@ int rt2x00pci_resume(struct pci_dev *pci 
    1212 } 
    1313 EXPORT_SYMBOL_GPL(rt2x00pci_resume); 
Note: See TracChangeset for help on using the changeset viewer.