Changeset 23061


Ignore:
Timestamp:
2010-09-15T00:53:54+02:00 (7 years ago)
Author:
nbd
Message:

mac80211: upgrade to wireless-testing 2010-09-14, replace the external carl9170 with the recently merged upstream version

Location:
trunk/package
Files:
3 added
5 deleted
20 edited
3 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r22965 r23061  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2010-08-31 
     13PKG_VERSION:=2010-09-14 
    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:=5d720b6d8de97ae61a4c3e4ee10a6de1 
     18PKG_MD5SUM:=88511287e013ff0f2843b3679f52f335 
    1919 
    2020PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    2828        CONFIG_PACKAGE_ATH_DEBUG \ 
    2929        CONFIG_ATH_USER_REGD \ 
     30 
     31CARL9170_FW_VERSION:=1.8.8.2 
    3032 
    3133include $(INCLUDE_DIR)/package.mk 
     
    9597P54USBFW:=2.13.24.0.lm87.arm 
    9698P54SPIFW:=2.13.0.0.a.13.14.arm 
     99CARL9170_FW:=carl9170-1.fw 
    97100 
    98101define Download/p54usb 
     
    116119endef 
    117120$(eval $(call Download,p54spi)) 
     121 
     122define Download/carl9170 
     123  FILE:=$(CARL9170_FW) 
     124  URL:=http://www.kernel.org/pub/linux/kernel/people/chr/carl9170/fw/$(CARL9170_FW_VERSION) 
     125  MD5SUM:=114c43846ed1d2f89cc92bd0e2ec0589 
     126endef 
     127$(eval $(call Download,carl9170)) 
    118128 
    119129define KernelPackage/p54/Default 
     
    448458endef 
    449459 
     460define KernelPackage/carl9170 
     461  $(call KernelPackage/mac80211/Default) 
     462  TITLE:=Driver for Atheros AR9170 USB sticks 
     463  DEPENDS:=@USB_SUPPORT +kmod-mac80211 +kmod-ath +kmod-usb-core 
     464  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/carl9170/carl9170.ko 
     465  AUTOLOAD:=$(call AutoLoad,60,carl9170) 
     466endef 
     467 
     468define KernelPackage/carl9170/install 
     469        $(INSTALL_DIR) $(1)/lib/firmware 
     470        $(INSTALL_DATA) $(DL_DIR)/$(CARL9170_FW) $(1)/lib/firmware/ 
     471endef 
     472 
     473 
    450474USB8388FW_NAME:=usb8388 
    451475USB8388FW_VERSION:=5.110.22.p23 
     
    495519        $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.ko 
    496520  AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio) 
    497 endef 
    498  
    499 define KernelPackage/ar9170 
    500   $(call KernelPackage/mac80211/Default) 
    501   TITLE:=Atheros AR9170 802.11n USB support 
    502   URL:=http://wireless.kernel.org/en/users/Drivers/ar9170 
    503   DEPENDS+= @USB_SUPPORT @!LINUX_2_6_25 +kmod-ath +kmod-usb-core 
    504   FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/ath/ar9170/ar9170usb.ko 
    505   AUTOLOAD:=$(call AutoLoad,27,ar9170usb) 
    506 endef 
    507  
    508 define KernelPackage/ar9170/description 
    509  This is a driver for the Atheros "otus" 802.11n USB devices. 
    510521endef 
    511522 
     
    822833        $(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS -DCONFIG_B43_LEDS -DCONFIG_B43LEGACY_LEDS -DCONFIG_AR9170_LEDS) \ 
    823834        -DCONFIG_B43_HWRNG -DCONFIG_B43LEGACY_HWRNG \ 
    824         $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS) \ 
     835        $(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),-DCONFIG_MAC80211_DEBUGFS -DCONFIG_ATH9K_DEBUGFS -DCONFIG_CARL9170_DEBUGFS) \ 
    825836        $(if $(CONFIG_PACKAGE_ATH_DEBUG),-DCONFIG_ATH_DEBUG -DCONFIG_ATH9K_PKTLOG) \ 
    826837        -D__CONFIG_MAC80211_RC_DEFAULT=minstrel \ 
     
    867878        CONFIG_ATH9K_COMMON=$(if $(CONFIG_PACKAGE_kmod-ath9k),m) \ 
    868879        CONFIG_ATH9K_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ 
     880        CONFIG_CARL9170=$(if $(CONFIG_PACKAGE_kmod-carl9170),m) \ 
     881        CONFIG_CARL9170_DEBUGFS=$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS),y) \ 
    869882        CONFIG_ZD1211RW=$(if $(CONFIG_PACKAGE_kmod-zd1211rw),m) \ 
    870883        CONFIG_P54_COMMON=$(if $(CONFIG_PACKAGE_kmod-p54-common),m) \ 
     
    912925        CONFIG_LIB80211_CRYPT_TKIP= \ 
    913926        CONFIG_IWLWIFI= \ 
     927        CONFIG_COMPAT_IWLWIFI= \ 
    914928        CONFIG_IWLAGN= \ 
    915929        CONFIG_MWL8K=$(if $(CONFIG_PACKAGE_kmod-mwl8k),m) \ 
     
    11221136$(eval $(call KernelPackage,ath9k)) 
    11231137$(eval $(call KernelPackage,ath)) 
    1124 $(eval $(call KernelPackage,ar9170)) 
     1138$(eval $(call KernelPackage,carl9170)) 
    11251139$(eval $(call KernelPackage,b43)) 
    11261140$(eval $(call KernelPackage,b43legacy)) 
  • trunk/package/mac80211/patches/001-disable_b44.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -292,8 +292,8 @@ endif 
     3@@ -297,8 +297,8 @@ endif #CONFIG_SSB 
    44  
    55 CONFIG_P54_PCI=m 
  • trunk/package/mac80211/patches/002-disable_rfkill.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -72,7 +72,7 @@ endif # build check 
     3@@ -74,7 +74,7 @@ endif # build check 
    44 endif # kernel Makefile check 
    55  
     
    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 @@ -557,8 +557,8 @@ endif #CONFIG_COMPAT_KERNEL_27 
     12@@ -572,8 +572,8 @@ 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/003-disable_bt.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -94,8 +94,8 @@ ifndef CONFIG_COMPAT_KERNEL_27 
     3@@ -96,8 +96,8 @@ ifndef CONFIG_COMPAT_KERNEL_27 
    44 ifeq ($(CONFIG_BT),y) 
    55 # we'll ignore compiling bluetooth 
  • trunk/package/mac80211/patches/005-disable_ssb_build.patch

    r22865 r23061  
    2020 include $(KLIB_BUILD)/.config 
    2121 endif 
    22 @@ -275,21 +274,6 @@ CONFIG_IPW2200_QOS=y 
    23  # 
    24  # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
     22@@ -280,21 +279,6 @@ endif #CONFIG_WEXT_PRIV 
     23 endif #CONFIG_WEXT_SPY 
     24 endif #CONFIG_WIRELESS_EXT 
    2525  
    26 -ifneq ($(CONFIG_SSB),) 
     26-ifdef CONFIG_SSB 
    2727-# Sonics Silicon Backplane 
    2828-CONFIG_SSB_SPROM=y 
     
    3232-CONFIG_SSB_PCIHOST=y 
    3333-CONFIG_SSB_B43_PCI_BRIDGE=y 
    34 -ifneq ($(CONFIG_PCMCIA),) 
     34-ifdef CONFIG_PCMCIA 
    3535-CONFIG_SSB_PCMCIAHOST=y 
    36 -endif 
     36-endif #CONFIG_PCMCIA 
    3737-# CONFIG_SSB_DEBUG=y 
    3838-CONFIG_SSB_DRIVER_PCICORE=y 
    39 -endif 
     39-endif #CONFIG_SSB 
    4040- 
    4141 CONFIG_P54_PCI=m 
    4242  
    4343 # CONFIG_B44=m 
    44 @@ -463,7 +447,6 @@ endif # end of SPI driver list 
     44@@ -474,7 +458,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    4545  
    46  ifneq ($(CONFIG_MMC),) 
     46 ifdef CONFIG_MMC 
    4747  
    4848-CONFIG_SSB_SDIOHOST=y 
    4949 CONFIG_B43_SDIO=y 
    5050  
    51  ifneq ($(CONFIG_CRC7),) 
     51 ifdef CONFIG_CRC7 
  • trunk/package/mac80211/patches/007-remove_misc_drivers.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -196,7 +196,7 @@ ifneq ($(CONFIG_WIRELESS_EXT),) 
    4  endif 
     3@@ -196,7 +196,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT 
     4 endif #CONFIG_WIRELESS_EXT 
    55  
    66 ifneq ($(CONFIG_STAGING),) 
    7 -CONFIG_COMPAT_STAGING=m 
     7- CONFIG_COMPAT_STAGING=m 
    88+# CONFIG_COMPAT_STAGING=m 
    99 endif 
    1010  
    1111 # mac80211 test driver 
    12 @@ -306,13 +306,13 @@ endif 
     12@@ -311,13 +311,13 @@ endif #CONFIG_CRC_ITU_T 
    1313 CONFIG_MWL8K=m 
    1414  
     
    2828 endif #CONFIG_COMPAT_KERNEL_27 
    2929  
    30  CONFIG_HERMES=m 
    31 @@ -361,17 +361,17 @@ CONFIG_ZD1211RW=m 
     30 ifdef CONFIG_WIRELESS_EXT 
     31@@ -372,17 +372,17 @@ CONFIG_ZD1211RW=m 
    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 
     
    5555  
    5656  
    57 @@ -474,17 +474,17 @@ CONFIG_BT_MRVL_SDIO=m 
    58   
    59  ifneq ($(CONFIG_COMPAT_STAGING),) 
    60  ifdef CONFIG_COMPAT_KERNEL_32 
    61 -CONFIG_ATH6KL_CFG80211=y 
    62 -CONFIG_ATH6KL_DEBUG=y 
    63 +# CONFIG_ATH6KL_CFG80211=y 
    64 +# CONFIG_ATH6KL_DEBUG=y 
    65  # CONFIG_ATH6KL_DISABLE_TARGET_DBGLOGS is not set 
    66  # CONFIG_ATH6KL_ENABLE_COEXISTENCE is not set 
    67  # CONFIG_ATH6KL_ENABLE_HOST_DEBUG is not set 
    68 -CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y 
    69 +# CONFIG_ATH6KL_ENABLE_TARGET_DEBUG_PRINTS=y 
    70  # CONFIG_ATH6KL_HCI_BRIDGE is not set 
    71  # CONFIG_ATH6KL_HTC_RAW_INTERFACE is not set 
    72  # CONFIG_ATH6KL_SKIP_ABI_VERSION_CHECK is not set 
    73 -CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y 
    74 -CONFIG_ATH6K_LEGACY=m 
    75 +# CONFIG_ATH6KL_VIRTUAL_SCATTER_GATHER=y 
    76 +# CONFIG_ATH6K_LEGACY=m 
    77  endif #CONFIG_COMPAT_KERNEL_32 
    78  endif 
    79   
  • trunk/package/mac80211/patches/008-led_default.patch

    r22866 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -115,7 +115,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr 
    4  # CONFIG_MAC80211_RC_PID=y 
     3@@ -132,7 +132,7 @@ CONFIG_COMPAT_MAC80211_RC_DEFAULT=minstr 
     4 CONFIG_MAC80211_RC_PID=y 
    55 CONFIG_MAC80211_RC_MINSTREL=y 
    66 CONFIG_MAC80211_RC_MINSTREL_HT=y 
     
    1010 # enable mesh networking too 
    1111 CONFIG_MAC80211_MESH=y 
    12 @@ -218,7 +218,7 @@ CONFIG_B43_PCI_AUTOSELECT=y 
    13  ifneq ($(CONFIG_PCMCIA),) 
    14  # CONFIG_B43_PCMCIA=y 
    15  endif 
     12@@ -233,7 +233,7 @@ CONFIG_B43_PCI_AUTOSELECT=y 
     13 ifdef CONFIG_PCMCIA 
     14 CONFIG_B43_PCMCIA=y 
     15 endif #CONFIG_PCMCIA 
    1616-CONFIG_B43_LEDS=y 
    1717+# CONFIG_B43_LEDS=y 
    1818 CONFIG_B43_PHY_LP=y 
    19  # CONFIG_B43_NPHY is not set 
     19 CONFIG_B43_NPHY=y 
    2020 # CONFIG_B43_FORCE_PIO=y 
    21 @@ -227,7 +227,7 @@ CONFIG_B43_PHY_LP=y 
     21@@ -242,7 +242,7 @@ CONFIG_B43_NPHY=y 
    2222 CONFIG_B43LEGACY=m 
    2323 CONFIG_B43LEGACY_HWRNG=y 
     
    2828 CONFIG_B43LEGACY_DMA=y 
    2929 CONFIG_B43LEGACY_PIO=y 
    30 @@ -499,7 +499,7 @@ endif 
     30@@ -529,7 +529,7 @@ endif 
    3131  
    3232 # p54 
     
    8282--- a/drivers/net/wireless/ath/ath9k/htc_drv_main.c 
    8383+++ b/drivers/net/wireless/ath/ath9k/htc_drv_main.c 
    84 @@ -872,6 +872,7 @@ static void ath9k_led_brightness_work(st 
     84@@ -871,6 +871,7 @@ static void ath9k_led_brightness_work(st 
    8585        } 
    8686 } 
     
    9090                                 enum led_brightness brightness) 
    9191 { 
    92 @@ -883,6 +884,7 @@ static void ath9k_led_brightness(struct  
     92@@ -882,6 +883,7 @@ static void ath9k_led_brightness(struct  
    9393                ieee80211_queue_delayed_work(priv->hw, 
    9494                                             &led->brightness_work, 0); 
     
    9898 static void ath9k_led_stop_brightness(struct ath9k_htc_priv *priv) 
    9999 { 
    100 @@ -895,6 +897,7 @@ static void ath9k_led_stop_brightness(st 
     100@@ -894,6 +896,7 @@ static void ath9k_led_stop_brightness(st 
    101101 static int ath9k_register_led(struct ath9k_htc_priv *priv, struct ath_led *led, 
    102102                              char *trigger) 
     
    106106  
    107107        led->priv = priv; 
    108 @@ -912,14 +915,19 @@ static int ath9k_register_led(struct ath 
     108@@ -911,14 +914,19 @@ static int ath9k_register_led(struct ath 
    109109        INIT_DELAYED_WORK(&led->brightness_work, ath9k_led_brightness_work); 
    110110  
  • trunk/package/mac80211/patches/009-remove_mac80211_module_dependence.patch

    r21449 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -42,21 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
     3@@ -42,23 +42,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
    44 endif 
    55 endif 
     
    1414-# skb->requeue 
    1515-# 
    16 -ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 27 && echo yes),yes) 
     16-# In kernel 2.6.32 both attributes were removed. 
     17-# 
     18-ifeq ($(shell test $(KERNEL_SUBLEVEL) -ge 27 -a $(KERNEL_SUBLEVEL) -le 31 && echo yes),yes) 
    1719-ifeq ($(CONFIG_MAC80211),) 
    18 -$(error "ERROR: Your >=2.6.27 kernel has CONFIG_MAC80211 disabled, you should have it CONFIG_MAC80211=m if you want to use this thing.") 
     20-$(error "ERROR: Your >=2.6.27 and <= 2.6.31 kernel has CONFIG_MAC80211 disabled, you should have it CONFIG_MAC80211=m if you want to use this thing.") 
    1921-endif 
    2022-endif 
  • trunk/package/mac80211/patches/010-no_pcmcia.patch

    r22865 r23061  
    1010 include $(KLIB_BUILD)/.config 
    1111 endif 
    12 @@ -216,7 +216,7 @@ CONFIG_B43=m 
     12@@ -214,7 +214,7 @@ CONFIG_B43=m 
    1313 CONFIG_B43_HWRNG=y 
    1414 CONFIG_B43_PCI_AUTOSELECT=y 
    15  ifneq ($(CONFIG_PCMCIA),) 
     15 ifdef CONFIG_PCMCIA 
    1616-CONFIG_B43_PCMCIA=y 
    1717+# CONFIG_B43_PCMCIA=y 
    18  endif 
    19  CONFIG_B43_LEDS=y 
     18 endif #CONFIG_PCMCIA 
     19 # CONFIG_B43_LEDS=y 
    2020 CONFIG_B43_PHY_LP=y 
  • trunk/package/mac80211/patches/011-no_sdio.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -432,7 +432,7 @@ endif # end of SPI driver list 
     3@@ -441,7 +441,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    44  
    5  ifneq ($(CONFIG_MMC),) 
     5 ifdef CONFIG_MMC 
    66  
    77-CONFIG_B43_SDIO=y 
    88+# CONFIG_B43_SDIO=y 
    99  
    10  ifneq ($(CONFIG_CRC7),) 
     10 ifdef CONFIG_CRC7 
    1111 CONFIG_WL1251_SDIO=m 
  • trunk/package/mac80211/patches/013-disable_b43_nphy.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -220,7 +220,7 @@ ifneq ($(CONFIG_PCMCIA),) 
    4  endif 
    5  CONFIG_B43_LEDS=y 
     3@@ -218,7 +218,7 @@ ifdef CONFIG_PCMCIA 
     4 endif #CONFIG_PCMCIA 
     5 # CONFIG_B43_LEDS=y 
    66 CONFIG_B43_PHY_LP=y 
    77-CONFIG_B43_NPHY=y 
  • trunk/package/mac80211/patches/015-remove-rt2x00-options.patch

    r22865 r23061  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -268,12 +268,12 @@ CONFIG_RTL8180=m 
     3@@ -271,12 +271,12 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    99 CONFIG_RT2400PCI=m 
    1010 CONFIG_RT2500PCI=m 
    11  ifneq ($(CONFIG_CRC_CCITT),) 
     11 ifdef CONFIG_CRC_CCITT 
    1212 CONFIG_RT2800PCI=m 
    1313-CONFIG_RT2800PCI_PCI=y 
     
    1616 # CONFIG_RT2800PCI_RT35XX=y 
    1717 # CONFIG_RT2800PCI_SOC=y 
    18 @@ -382,7 +382,7 @@ CONFIG_RT2800USB_RT30XX=y 
     18@@ -391,7 +391,7 @@ CONFIG_RT2800USB_RT30XX=y 
    1919 CONFIG_RT2800USB_RT35XX=y 
    2020 CONFIG_RT2800USB_UNKNOWN=y 
    21  endif 
     21 endif #CONFIG_CRC_CCITT 
    2222-CONFIG_RT2X00_LIB_USB=m 
    2323+# CONFIG_RT2X00_LIB_USB=m 
    2424 NEED_RT2X00=y 
    2525 # RT73USB requires firmware 
    26  ifneq ($(CONFIG_CRC_ITU_T),) 
     26 ifdef CONFIG_CRC_ITU_T 
  • trunk/package/mac80211/patches/016-remove_pid_algo.patch

    r21756 r23061  
    99 CONFIG_MAC80211_RC_MINSTREL=y 
    1010 CONFIG_MAC80211_RC_MINSTREL_HT=y 
    11  CONFIG_MAC80211_LEDS=y 
     11 # CONFIG_MAC80211_LEDS=y 
  • trunk/package/mac80211/patches/130-printk_debug_revert.patch

    r22865 r23061  
    1515--- a/net/wireless/core.c 
    1616+++ b/net/wireless/core.c 
    17 @@ -929,52 +929,3 @@ static void __exit cfg80211_exit(void) 
     17@@ -936,52 +936,3 @@ static void __exit cfg80211_exit(void) 
    1818        destroy_workqueue(cfg80211_wq); 
    1919 } 
  • trunk/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch

    r21988 r23061  
    11--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    22+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    3 @@ -120,6 +120,9 @@ static void ath_unregister_led(struct at 
     3@@ -128,6 +128,9 @@ static void ath_unregister_led(struct at 
    44  
    55 void ath_deinit_leds(struct ath_softc *sc) 
     
    1111        sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; 
    1212        ath_unregister_led(&sc->tx_led); 
    13 @@ -133,6 +136,9 @@ void ath_init_leds(struct ath_softc *sc) 
     13@@ -141,6 +144,9 @@ void ath_init_leds(struct ath_softc *sc) 
    1414        char *trigger; 
    1515        int ret; 
  • trunk/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

    r21988 r23061  
    1111--- a/drivers/net/wireless/ath/ath9k/init.c 
    1212+++ b/drivers/net/wireless/ath/ath9k/init.c 
    13 @@ -538,6 +538,7 @@ static int ath9k_init_softc(u16 devid, s 
     13@@ -540,6 +540,7 @@ static int ath9k_init_softc(u16 devid, s 
    1414 { 
    1515        struct ath_hw *ah = NULL; 
     
    1919        int csz = 0; 
    2020  
    21 @@ -549,6 +550,10 @@ static int ath9k_init_softc(u16 devid, s 
     21@@ -551,6 +552,10 @@ static int ath9k_init_softc(u16 devid, s 
    2222        ah->hw_version.subsysid = subsysid; 
    2323        sc->sc_ah = ah; 
  • trunk/package/mac80211/patches/408-ath9k_tweak_rx_intr_mitigation.patch

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

    r22865 r23061  
    99  
    1010 static char *dev_info = "ath9k"; 
    11 @@ -553,6 +554,8 @@ static int ath9k_init_softc(u16 devid, s 
     11@@ -555,6 +556,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 @@ -675,6 +678,24 @@ void ath9k_set_hw_capab(struct ath_softc 
     20@@ -677,6 +680,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 @@ -693,6 +714,9 @@ int ath9k_init_device(u16 devid, struct  
     45@@ -695,6 +716,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 @@ -589,6 +589,8 @@ struct ath_softc { 
     57@@ -643,6 +643,8 @@ struct ath_softc { 
    5858  
    5959        int beacon_interval; 
  • trunk/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch

    r22865 r23061  
    11--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    22+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    3 @@ -139,7 +139,9 @@ void ath_init_leds(struct ath_softc *sc) 
     3@@ -147,7 +147,9 @@ void ath_init_leds(struct ath_softc *sc) 
    44        if (AR_SREV_9100(sc->sc_ah)) 
    55                return; 
  • trunk/package/mac80211/patches/500-ath9k_use_minstrel.patch

    r21988 r23061  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -659,7 +659,11 @@ void ath9k_set_hw_capab(struct ath_softc 
     3@@ -661,7 +661,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); 
Note: See TracChangeset for help on using the changeset viewer.