Changeset 19139


Ignore:
Timestamp:
2010-01-15T02:16:40+01:00 (8 years ago)
Author:
nbd
Message:

mac80211: update to wireless-testing+wireless-2.6 from 2010-01-13

Location:
trunk/package/mac80211
Files:
1 added
4 deleted
13 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r19110 r19139  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2010-01-11 
     13PKG_VERSION:=2010-01-13 
    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:=78a36bb7d28be7028f640a10eaa4692b 
     18PKG_MD5SUM:=b773266f141a1a6349b6e09b84948f02 
    1919 
    2020PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
  • trunk/package/mac80211/patches/001-disable_b44.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -270,10 +270,10 @@ endif 
     3@@ -281,10 +281,10 @@ endif 
    44  
    55 CONFIG_P54_PCI=m 
  • trunk/package/mac80211/patches/002-disable_rfkill.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -16,7 +16,7 @@ include $(KLIB_BUILD)/.config 
    4  endif 
     3@@ -73,7 +73,7 @@ endif # build check 
     4 endif # kernel Makefile check 
    55  
    66 # These both are needed by compat-wireless || compat-bluetooth so enable them 
     
    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 @@ -463,8 +463,8 @@ endif 
     12@@ -474,8 +474,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. 
  • trunk/package/mac80211/patches/003-disable_bt.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -36,8 +36,8 @@ endif 
     3@@ -95,8 +95,8 @@ ifndef CONFIG_COMPAT_KERNEL_27 
    44 ifeq ($(CONFIG_BT),y) 
    55 # we'll ignore compiling bluetooth 
    66 else 
    7 -CONFIG_COMPAT_BLUETOOTH=y 
    8 -CONFIG_COMPAT_BLUETOOTH_MODULES=m 
     7- CONFIG_COMPAT_BLUETOOTH=y 
     8- CONFIG_COMPAT_BLUETOOTH_MODULES=m 
    99+# CONFIG_COMPAT_BLUETOOTH=y 
    1010+# CONFIG_COMPAT_BLUETOOTH_MODULES=m 
    1111 endif 
     12 endif # Kernel >= 2.6.26 
    1213  
    13  # We will warn when you don't have MQ support or NET_SCHED enabled. 
  • trunk/package/mac80211/patches/007-remove_misc_drivers.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -303,10 +303,10 @@ CONFIG_PCI_ATMEL=m 
     3@@ -314,10 +314,10 @@ CONFIG_PCI_ATMEL=m 
    44 CONFIG_MWL8K=m 
    55  
     
    1616 endif 
    1717 ## end of PCI 
    18 @@ -345,10 +345,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
     18@@ -356,10 +356,10 @@ CONFIG_USB_NET_COMPAT_RNDIS_HOST=n 
    1919 CONFIG_USB_NET_COMPAT_RNDIS_WLAN=n 
    2020 CONFIG_USB_NET_COMPAT_CDCETHER=n 
  • trunk/package/mac80211/patches/009-remove_mac80211_module_dependence.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -69,21 +69,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
     3@@ -44,21 +44,6 @@ $(error "ERROR: Your 2.6.27 kernel has C 
    44 endif 
    55 endif 
  • trunk/package/mac80211/patches/010-b43_config.patch

    r19063 r19139  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -188,9 +188,9 @@ CONFIG_B43_HWRNG=y 
     3@@ -199,9 +199,9 @@ CONFIG_B43_HWRNG=y 
    44 CONFIG_B43_PCI_AUTOSELECT=y 
    55 CONFIG_B43_PCICORE_AUTOSELECT=y 
     
    1313 CONFIG_B43_PHY_LP=y 
    1414 # CONFIG_B43_DEBUG=y 
    15 @@ -245,8 +245,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y 
     15@@ -256,8 +256,8 @@ CONFIG_SSB_PCIHOST_POSSIBLE=y 
    1616 CONFIG_SSB_PCIHOST=y 
    1717 CONFIG_SSB_B43_PCI_BRIDGE=y 
  • trunk/package/mac80211/patches/012-remove_rfkill.patch

    r18465 r19139  
    2727 }; 
    2828  
    29 -#if defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_MODULE_BACKPORT) 
     29-#if defined(CONFIG_RFKILL_BACKPORT) || defined(CONFIG_RFKILL_BACKPORT_MODULE) 
    3030+#if 0 
    3131 /** 
  • trunk/package/mac80211/patches/201-ath5k-WAR-for-AR71xx-PCI-bug.patch

    r18294 r19139  
    11--- a/drivers/net/wireless/ath/ath5k/reset.c 
    22+++ b/drivers/net/wireless/ath/ath5k/reset.c 
    3 @@ -1357,10 +1357,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah,  
     3@@ -1360,10 +1360,18 @@ int ath5k_hw_reset(struct ath5k_hw *ah,  
    44         * guess we can tweak it and see how it goes ;-) 
    55         */ 
  • trunk/package/mac80211/patches/401-ath9k-dont-register-leds-on-ar9100.patch

    r19063 r19139  
    1 --- a/drivers/net/wireless/ath/ath9k/main.c 
    2 +++ b/drivers/net/wireless/ath/ath9k/main.c 
    3 @@ -1103,6 +1103,9 @@ static void ath_unregister_led(struct at 
     1--- a/drivers/net/wireless/ath/ath9k/gpio.c 
     2+++ b/drivers/net/wireless/ath/ath9k/gpio.c 
     3@@ -119,6 +119,9 @@ static void ath_unregister_led(struct at 
    44  
    5  static void ath_deinit_leds(struct ath_softc *sc) 
     5 void ath_deinit_leds(struct ath_softc *sc) 
    66 { 
    77+       if (AR_SREV_9100(sc->sc_ah)) 
     
    1111        sc->sc_flags &= ~SC_OP_LED_ASSOCIATED; 
    1212        ath_unregister_led(&sc->tx_led); 
    13 @@ -1121,6 +1124,9 @@ static void ath_init_leds(struct ath_sof 
    14         else 
    15                 sc->sc_ah->led_pin = ATH_LED_PIN_DEF; 
     13@@ -132,6 +135,9 @@ void ath_init_leds(struct ath_softc *sc) 
     14        char *trigger; 
     15        int ret; 
    1616  
    1717+       if (AR_SREV_9100(sc->sc_ah)) 
    1818+               return; 
    1919+ 
    20         /* Configure gpio 1 for output */ 
    21         ath9k_hw_cfg_output(sc->sc_ah, sc->sc_ah->led_pin, 
    22                             AR_GPIO_OUTPUT_MUX_AS_OUTPUT); 
     20        if (AR_SREV_9287(sc->sc_ah)) 
     21                sc->sc_ah->led_pin = ATH_LED_PIN_9287; 
     22        else 
  • trunk/package/mac80211/patches/406-ath9k-set-AH_USE_EEPROM-only-if-no-platform-data-present.patch

    r19063 r19139  
    2323 #include "btcoex.h" 
    2424  
    25 @@ -1597,6 +1598,7 @@ static int ath_init_softc(u16 devid, str 
     25--- a/drivers/net/wireless/ath/ath9k/init.c 
     26+++ b/drivers/net/wireless/ath/ath9k/init.c 
     27@@ -531,6 +531,7 @@ static int ath9k_init_softc(u16 devid, s 
    2628 { 
    2729        struct ath_hw *ah = NULL; 
    2830        struct ath_common *common; 
    2931+       struct ath9k_platform_data *pdata; 
    30         int r = 0, i; 
     32        int ret = 0, i; 
    3133        int csz = 0; 
    32         int qnum; 
    33 @@ -1619,6 +1621,10 @@ static int ath_init_softc(u16 devid, str 
    3434  
    35         ah->hw_version.devid = devid; 
     35@@ -542,6 +543,10 @@ static int ath9k_init_softc(u16 devid, s 
    3636        ah->hw_version.subsysid = subsysid; 
     37        sc->sc_ah = ah; 
     38  
    3739+       pdata = (struct ath9k_platform_data *) sc->dev->platform_data; 
    3840+       if (!pdata) 
    3941+               ah->ah_flags |= AH_USE_EEPROM; 
    4042+ 
    41         sc->sc_ah = ah; 
    42   
    4343        common = ath9k_hw_common(ah); 
     44        common->ops = &ath9k_common_ops; 
     45        common->bus_ops = bus_ops; 
  • trunk/package/mac80211/patches/510-ath9k_debugfs_chainmask.patch

    r19063 r19139  
    9292                             size_t count, loff_t *ppos) 
    9393 { 
    94 @@ -600,6 +684,16 @@ int ath9k_init_debug(struct ath_hw *ah) 
     94@@ -710,6 +794,16 @@ int ath9k_init_debug(struct ath_hw *ah) 
    9595                goto err; 
    9696 #endif 
     
    109109                                       sc->debug.debugfs_phy, sc, &fops_dma); 
    110110        if (!sc->debug.debugfs_dma) 
    111 @@ -643,6 +737,8 @@ void ath9k_exit_debug(struct ath_hw *ah) 
     111@@ -760,6 +854,8 @@ void ath9k_exit_debug(struct ath_hw *ah) 
    112112        struct ath_common *common = ath9k_hw_common(ah); 
    113113        struct ath_softc *sc = (struct ath_softc *) common->priv; 
     
    115115+       debugfs_remove(sc->debug.debugfs_tx_chainmask); 
    116116+       debugfs_remove(sc->debug.debugfs_rx_chainmask); 
     117        debugfs_remove(sc->debug.debugfs_recv); 
    117118        debugfs_remove(sc->debug.debugfs_xmit); 
    118119        debugfs_remove(sc->debug.debugfs_wiphy); 
    119         debugfs_remove(sc->debug.debugfs_rcstat); 
    120120--- a/drivers/net/wireless/ath/ath9k/debug.h 
    121121+++ b/drivers/net/wireless/ath/ath9k/debug.h 
    122 @@ -123,6 +123,8 @@ struct ath_stats { 
     122@@ -148,6 +148,8 @@ struct ath_stats { 
    123123 }; 
    124124  
  • trunk/package/mac80211/patches/520-ath9k_debugfs_regaccess.patch

    r19063 r19139  
    11--- a/drivers/net/wireless/ath/ath9k/debug.c 
    22+++ b/drivers/net/wireless/ath/ath9k/debug.c 
    3 @@ -664,6 +664,86 @@ static const struct file_operations fops 
     3@@ -774,6 +774,86 @@ static const struct file_operations fops 
    44        .owner = THIS_MODULE 
    55 }; 
     
    8888 { 
    8989        struct ath_common *common = ath9k_hw_common(ah); 
    90 @@ -726,6 +806,17 @@ int ath9k_init_debug(struct ath_hw *ah) 
    91         if (!sc->debug.debugfs_xmit) 
     90@@ -843,6 +923,17 @@ int ath9k_init_debug(struct ath_hw *ah) 
     91        if (!sc->debug.debugfs_recv) 
    9292                goto err; 
    9393  
     
    106106 err: 
    107107        ath9k_exit_debug(ah); 
    108 @@ -739,6 +830,8 @@ void ath9k_exit_debug(struct ath_hw *ah) 
     108@@ -856,6 +947,8 @@ void ath9k_exit_debug(struct ath_hw *ah) 
    109109  
    110110        debugfs_remove(sc->debug.debugfs_tx_chainmask); 
     
    112112+       debugfs_remove(sc->debug.debugfs_regval); 
    113113+       debugfs_remove(sc->debug.debugfs_regidx); 
     114        debugfs_remove(sc->debug.debugfs_recv); 
    114115        debugfs_remove(sc->debug.debugfs_xmit); 
    115116        debugfs_remove(sc->debug.debugfs_wiphy); 
    116         debugfs_remove(sc->debug.debugfs_rcstat); 
    117117--- a/drivers/net/wireless/ath/ath9k/debug.h 
    118118+++ b/drivers/net/wireless/ath/ath9k/debug.h 
    119 @@ -132,6 +132,9 @@ struct ath9k_debug { 
    120         struct dentry *debugfs_rcstat; 
     119@@ -158,6 +158,9 @@ struct ath9k_debug { 
    121120        struct dentry *debugfs_wiphy; 
    122121        struct dentry *debugfs_xmit; 
     122        struct dentry *debugfs_recv; 
    123123+       struct dentry *debugfs_regidx; 
    124124+       struct dentry *debugfs_regval; 
  • trunk/package/mac80211/patches/530-monitor_queue_select_fix.patch

    r19138 r19139  
    11--- a/net/mac80211/iface.c 
    22+++ b/net/mac80211/iface.c 
    3 @@ -696,10 +696,14 @@ static u16 ieee80211_monitor_select_queu 
     3@@ -697,10 +697,14 @@ static u16 ieee80211_monitor_select_queu 
    44  
    55        hdr = (void *)((u8 *)skb->data + le16_to_cpu(rtap->it_len)); 
Note: See TracChangeset for help on using the changeset viewer.