Changeset 22039


Ignore:
Timestamp:
2010-07-02T00:22:39+02:00 (7 years ago)
Author:
nbd
Message:

merge latest mac80211 from trunk (as of r22038) to backfire

Location:
branches/backfire/package/mac80211
Files:
9 added
3 deleted
19 edited

Legend:

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

    r22021 r22039  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2010-06-10 
    14 PKG_RELEASE:=2 
     13PKG_VERSION:=2010-06-28 
     14PKG_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:=4074469689f7a5a0d2e038f2b5dad0bb 
     18PKG_MD5SUM:=10100e68991ed0749ee52cfc1704966b 
    1919 
    2020PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
     
    3636  URL:=http://linuxwireless.org/ 
    3737  MAINTAINER:=Felix Fietkau <nbd@openwrt.org> 
    38   DEPENDS:=@LINUX_2_6 @(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN) 
     38  DEPENDS:=@(!(TARGET_avr32||TARGET_ep93xx||TARGET_ps3||TARGET_pxcab)||BROKEN) 
    3939endef 
    4040 
     
    441441$(eval $(call Download,usb8388)) 
    442442 
    443 define KernelPackage/libertas 
     443SD8686FW_NAME:=sd8686 
     444SD8686FW_VERSION:=9.70.7.p0 
     445 
     446define Download/sd8686 
     447  URL:=http://dev.laptop.org/pub/firmware/libertas/ 
     448  FILE:=$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin 
     449  MD5SUM=b4f8be61e19780a14836f146c538c5dd 
     450endef 
     451$(eval $(call Download,sd8686)) 
     452 
     453SD8686HELPER_NAME:=sd8686_helper 
     454 
     455define Download/sd8686_helper 
     456  URL:=http://dev.laptop.org/pub/firmware/libertas/ 
     457  FILE:=$(SD8686HELPER_NAME).bin 
     458  MD5SUM=2a4d8f4df198ce949c350df5674f4ac6 
     459endef 
     460$(eval $(call Download,sd8686_helper)) 
     461 
     462define KernelPackage/libertas-usb 
    444463  $(call KernelPackage/mac80211/Default) 
    445464  DEPENDS+= @USB_SUPPORT +kmod-mac80211 +kmod-usb-core +kmod-lib80211 
     
    451470endef 
    452471 
     472define KernelPackage/libertas-sd 
     473  $(call KernelPackage/mac80211/Default) 
     474  DEPENDS+= +kmod-mac80211 +kmod-lib80211 
     475  TITLE:=Marvell 88W8686 Wireless Driver 
     476  FILES:= \ 
     477        $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas.$(LINUX_KMOD_SUFFIX) \ 
     478        $(PKG_BUILD_DIR)/drivers/net/wireless/libertas/libertas_sdio.$(LINUX_KMOD_SUFFIX) 
     479  AUTOLOAD:=$(call AutoLoad,27,libertas libertas_sdio) 
     480endef 
    453481 
    454482define KernelPackage/ar9170 
     
    849877        CONFIG_PCMCIA= \ 
    850878        CONFIG_LIBIPW=$(if $(CONFIG_PACKAGE_kmod-net-libipw),m) \ 
    851         CONFIG_LIBERTAS=$(if $(CONFIG_PACKAGE_kmod-libertas),m) \ 
     879        CONFIG_LIBERTAS=$(if $(CONFIG_PACKAGE_kmod-libertas-sd)$(CONFIG_PACKAGE_kmod-libertas-usb),m) \ 
    852880        CONFIG_LIBERTAS_CS= \ 
    853         CONFIG_LIBERTAS_SDIO= \ 
     881        CONFIG_LIBERTAS_SPI= \ 
     882        CONFIG_LIBERTAS_SDIO=$(if $(CONFIG_PACKAGE_kmod-libertas-sd),m) \ 
    854883        CONFIG_LIBERTAS_THINFIRM= \ 
    855         CONFIG_LIBERTAS_USB=$(if $(CONFIG_PACKAGE_kmod-libertas),m) \ 
     884        CONFIG_LIBERTAS_USB=$(if $(CONFIG_PACKAGE_kmod-libertas-usb),m) \ 
    856885        CONFIG_IPW2100=$(if $(CONFIG_PACKAGE_kmod-net-ipw2100),m) \ 
    857886        CONFIG_IPW2200=$(if $(CONFIG_PACKAGE_kmod-net-ipw2200),m) \ 
     
    925954endef 
    926955 
    927 define KernelPackage/libertas/install 
     956define KernelPackage/libertas-usb/install 
    928957        $(INSTALL_DIR) $(1)/lib/firmware 
    929958        $(INSTALL_DATA) $(DL_DIR)/$(USB8388FW_NAME)-$(USB8388FW_VERSION).bin $(1)/lib/firmware/$(USB8388FW_NAME).bin 
     959endef 
     960 
     961define KernelPackage/libertas-sd/install 
     962        echo "Libertas install: $(CONFIG_PACKAGE_kmod-libertas-sd)" 
     963        $(INSTALL_DIR) $(1)/lib/firmware 
     964        $(INSTALL_DATA) $(DL_DIR)/$(SD8686FW_NAME)-$(SD8686FW_VERSION).bin $(1)/lib/firmware/$(SD8686FW_NAME).bin 
     965        $(INSTALL_DATA) $(DL_DIR)/$(SD8686HELPER_NAME).bin $(1)/lib/firmware/$(SD8686HELPER_NAME).bin 
    930966endef 
    931967 
     
    10341070 
    10351071$(eval $(call KernelPackage,ath5k)) 
    1036 $(eval $(call KernelPackage,libertas)) 
     1072$(eval $(call KernelPackage,libertas-usb)) 
     1073$(eval $(call KernelPackage,libertas-sd)) 
    10371074$(eval $(call KernelPackage,cfg80211)) 
    10381075$(eval $(call KernelPackage,mac80211)) 
  • branches/backfire/package/mac80211/patches/001-disable_b44.patch

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

    r21803 r22039  
    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 @@ -488,8 +488,8 @@ endif 
     12@@ -495,8 +495,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

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

    r21803 r22039  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -271,13 +271,13 @@ endif 
     3@@ -282,13 +282,13 @@ endif 
    44 CONFIG_MWL8K=m 
    55  
     
    2020  
    2121 CONFIG_HERMES=m 
    22 @@ -331,10 +331,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
     22@@ -342,10 +342,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
    2323 CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n 
    2424 CONFIG_USB_NET_COMPAT_CDCETHER=n 
  • branches/backfire/package/mac80211/patches/010-no_pcmcia.patch

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

    r21803 r22039  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -387,7 +387,7 @@ endif # end of SPI driver list 
     3@@ -398,7 +398,7 @@ endif # end of SPI driver list 
    44  
    55 ifneq ($(CONFIG_MMC),) 
     
    99 CONFIG_WL1251_SDIO=m 
    1010  
    11  ifneq ($(CONFIG_ARM),) 
     11 ifndef CONFIG_COMPAT_KERNEL_32 
  • branches/backfire/package/mac80211/patches/013-disable_b43_nphy.patch

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

    r21803 r22039  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -233,12 +233,12 @@ CONFIG_RTL8180=m 
     3@@ -244,12 +244,12 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    1616 # CONFIG_RT2800PCI_RT35XX=y 
    1717 # CONFIG_RT2800PCI_SOC=y 
    18 @@ -344,7 +344,7 @@ CONFIG_RT2800USB_RT30XX=y 
     18@@ -355,7 +355,7 @@ CONFIG_RT2800USB_RT30XX=y 
    1919 CONFIG_RT2800USB_RT35XX=y 
    2020 CONFIG_RT2800USB_UNKNOWN=y 
  • branches/backfire/package/mac80211/patches/110-disable_usb_compat.patch

    r21649 r22039  
    1212--- a/compat/compat-2.6.29.c 
    1313+++ b/compat/compat-2.6.29.c 
    14 @@ -50,7 +50,7 @@ void netdev_attach_ops(struct net_device 
     14@@ -51,7 +51,7 @@ void netdev_attach_ops(struct net_device 
    1515 EXPORT_SYMBOL(netdev_attach_ops); 
    1616  
  • branches/backfire/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch

    r19139 r22039  
    11--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    22+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    3 @@ -119,6 +119,9 @@ static void ath_unregister_led(struct at 
     3@@ -120,6 +120,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 @@ -132,6 +135,9 @@ void ath_init_leds(struct ath_softc *sc) 
     13@@ -133,6 +136,9 @@ void ath_init_leds(struct ath_softc *sc) 
    1414        char *trigger; 
    1515        int ret; 
  • branches/backfire/package/mac80211/patches/403-ath9k-fix-invalid-mac-address-handling.patch

    r21803 r22039  
    99  
    1010 #include "hw.h" 
    11 @@ -450,8 +451,16 @@ static int ath9k_hw_init_macaddr(struct  
     11@@ -451,8 +452,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/405-ath9k-read-eeprom-data-from-platform-data-on-pci-bus.patch

    r21649 r22039  
    99  
    1010 static DEFINE_PCI_DEVICE_TABLE(ath_pci_id_table) = { 
    11 @@ -52,21 +53,36 @@ static void ath_pci_read_cachesize(struc 
     11@@ -53,21 +54,36 @@ static void ath_pci_read_cachesize(struc 
    1212  
    1313 static bool ath_pci_eeprom_read(struct ath_common *common, u32 off, u16 *data) 
  • branches/backfire/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

    r21803 r22039  
    1111--- a/drivers/net/wireless/ath/ath9k/init.c 
    1212+++ b/drivers/net/wireless/ath/ath9k/init.c 
    13 @@ -556,6 +556,7 @@ static int ath9k_init_softc(u16 devid, s 
     13@@ -538,6 +538,7 @@ static int ath9k_init_softc(u16 devid, s 
    1414 { 
    1515        struct ath_hw *ah = NULL; 
     
    1919        int csz = 0; 
    2020  
    21 @@ -567,6 +568,10 @@ static int ath9k_init_softc(u16 devid, s 
     21@@ -549,6 +550,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 @@ -423,10 +423,6 @@ static void ath9k_hw_init_defaults(struc 
     34@@ -422,10 +422,6 @@ static void ath9k_hw_init_defaults(struc 
    3535        ah->hw_version.magic = AR5416_MAGIC; 
    3636        ah->hw_version.subvendorid = 0; 
     
    4141- 
    4242        ah->atim_window = 0; 
    43         ah->sta_id1_defaults = AR_STA_ID1_CRPT_MIC_ENABLE; 
    44         ah->beacon_interval = 100; 
     43        ah->sta_id1_defaults = 
     44                AR_STA_ID1_CRPT_MIC_ENABLE | 
  • branches/backfire/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r21803 r22039  
    1212 #include "hw-ops.h" 
    1313 #include "rc.h" 
    14 @@ -435,18 +437,23 @@ static void ath9k_hw_init_defaults(struc 
     14@@ -436,18 +438,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

    r21803 r22039  
    11--- a/drivers/net/wireless/ath/ath9k/hw.c 
    22+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    3 @@ -1398,7 +1398,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     3@@ -1407,7 +1407,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

    r21803 r22039  
    99  
    1010 static char *dev_info = "ath9k"; 
    11 @@ -571,6 +572,8 @@ static int ath9k_init_softc(u16 devid, s 
     11@@ -553,6 +554,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 @@ -693,6 +696,24 @@ void ath9k_set_hw_capab(struct ath_softc 
     20@@ -675,6 +678,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 @@ -711,6 +732,9 @@ int ath9k_init_device(u16 devid, struct  
     45@@ -693,6 +714,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 @@ -583,6 +583,8 @@ struct ath_softc { 
     57@@ -594,6 +594,8 @@ struct ath_softc { 
    5858  
    5959        int beacon_interval; 
  • branches/backfire/package/mac80211/patches/410-ath9k-wndr3700-led-pin-fix.patch

    r21803 r22039  
    11--- a/drivers/net/wireless/ath/ath9k/gpio.c 
    22+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
    3 @@ -138,7 +138,9 @@ void ath_init_leds(struct ath_softc *sc) 
     3@@ -139,7 +139,9 @@ void ath_init_leds(struct ath_softc *sc) 
    44        if (AR_SREV_9100(sc->sc_ah)) 
    55                return; 
     
    1414--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    1515+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    16 @@ -458,6 +458,7 @@ void ath9k_btcoex_timer_pause(struct ath 
     16@@ -466,6 +466,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

    r21803 r22039  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -677,7 +677,11 @@ void ath9k_set_hw_capab(struct ath_softc 
     3@@ -659,7 +659,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.