Changeset 25749


Ignore:
Timestamp:
2011-02-27T12:22:26+01:00 (7 years ago)
Author:
nbd
Message:

mac80211: update to 2011-02-25

Location:
trunk/package/mac80211
Files:
1 added
1 deleted
25 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r25518 r25749  
    1111PKG_NAME:=mac80211 
    1212 
    13 PKG_VERSION:=2011-02-07 
     13PKG_VERSION:=2011-02-25 
    1414PKG_RELEASE:=1 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    16 PKG_MD5SUM:=a194610426c81ed5ad71ee83330c9669 
     16PKG_MD5SUM:=c0242cc152a157902ff60fe05d1773b2 
    1717 
    1818PKG_SOURCE:=compat-wireless-$(PKG_VERSION).tar.bz2 
  • trunk/package/mac80211/patches/001-disable_b44.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -311,8 +311,8 @@ endif #CONFIG_SSB 
     3@@ -316,8 +316,8 @@ endif #CONFIG_SSB 
    44  
    55 CONFIG_P54_PCI=m 
  • trunk/package/mac80211/patches/002-disable_rfkill.patch

    r24948 r25749  
    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 @@ -613,10 +613,10 @@ endif #CONFIG_COMPAT_KERNEL_27 
     12@@ -623,10 +623,10 @@ 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/005-disable_ssb_build.patch

    r24948 r25749  
    2020 include $(KLIB_BUILD)/.config 
    2121 endif 
    22 @@ -295,19 +294,18 @@ CONFIG_IPW2200_QOS=y 
     22@@ -300,19 +299,18 @@ CONFIG_IPW2200_QOS=y 
    2323 # % echo 1 > /sys/bus/pci/drivers/ipw2200/*/rtap_iface 
    2424 endif #CONFIG_WIRELESS_EXT 
     
    5252 CONFIG_P54_PCI=m 
    5353  
    54 @@ -505,7 +503,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
     54@@ -514,7 +512,6 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    5555  
    5656 ifdef CONFIG_MMC 
  • trunk/package/mac80211/patches/007-remove_misc_drivers.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -202,7 +202,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT 
     3@@ -204,7 +204,7 @@ $(warning "WARNING: CONFIG_CFG80211_WEXT 
    44 endif #CONFIG_WIRELESS_EXT 
    55  
     
    1010  
    1111 # mac80211 test driver 
    12 @@ -336,13 +336,13 @@ endif #CONFIG_CRC_ITU_T 
     12@@ -342,13 +342,13 @@ endif #CONFIG_CRC_ITU_T 
    1313 CONFIG_MWL8K=m 
    1414  
     
    2929  
    3030 ifdef CONFIG_WIRELESS_EXT 
    31 @@ -396,21 +396,21 @@ CONFIG_ZD1211RW=m 
     31@@ -403,21 +403,21 @@ endif #CONFIG_COMPAT_KERNEL_29 
    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 
  • trunk/package/mac80211/patches/010-no_pcmcia.patch

    r24948 r25749  
    1010 include $(KLIB_BUILD)/.config 
    1111 endif 
    12 @@ -229,7 +229,7 @@ CONFIG_B43=m 
     12@@ -234,7 +234,7 @@ CONFIG_B43=m 
    1313 CONFIG_B43_HWRNG=y 
    1414 CONFIG_B43_PCI_AUTOSELECT=y 
  • trunk/package/mac80211/patches/011-no_sdio.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -486,7 +486,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
     3@@ -495,7 +495,7 @@ endif #CONFIG_SPI_MASTER end of SPI driv 
    44  
    55 ifdef CONFIG_MMC 
  • trunk/package/mac80211/patches/013-disable_b43_nphy.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -235,7 +235,7 @@ ifdef CONFIG_MAC80211_LEDS 
     3@@ -240,7 +240,7 @@ ifdef CONFIG_MAC80211_LEDS 
    44 CONFIG_B43_LEDS=y 
    55 endif #CONFIG_MAC80211_LEDS 
  • trunk/package/mac80211/patches/015-remove-rt2x00-options.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -299,7 +299,7 @@ CONFIG_RTL8180=m 
     3@@ -304,7 +304,7 @@ CONFIG_RTL8180=m 
    44  
    55 CONFIG_ADM8211=m 
     
    1010 CONFIG_RT2500PCI=m 
    1111 ifdef CONFIG_CRC_CCITT 
    12 @@ -437,7 +437,7 @@ CONFIG_RT2800USB=m 
     12@@ -444,7 +444,7 @@ CONFIG_RT2800USB=m 
    1313 # CONFIG_RT2800USB_RT35XX=y 
    1414 CONFIG_RT2800USB_UNKNOWN=y 
  • trunk/package/mac80211/patches/017-remove_ath9k_rc.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -212,7 +212,7 @@ CONFIG_ATH9K_COMMON=m 
     3@@ -207,7 +207,7 @@ CONFIG_ATH9K_COMMON=m 
    44 # as default once we get minstrel properly tested and blessed by 
    55 # our systems engineering team. CCK rates also need to be used 
     
    88+# CONFIG_ATH9K_RATE_CONTROL=y 
    99  
    10   
    11  CONFIG_COMPAT_IWLWIFI=m 
     10 # PCI Drivers 
     11 ifdef CONFIG_PCI 
  • trunk/package/mac80211/patches/019-remove_ath5k_pci_option.patch

    r24948 r25749  
    11--- a/config.mk 
    22+++ b/config.mk 
    3 @@ -195,7 +195,7 @@ CONFIG_MAC80211_HWSIM=m 
     3@@ -212,7 +212,7 @@ CONFIG_ATH9K_COMMON=m 
     4 # PCI Drivers 
    45 ifdef CONFIG_PCI 
    56  
    6  CONFIG_ATH5K=m 
    77-CONFIG_ATH5K_PCI=y 
    88+# CONFIG_ATH5K_PCI=y 
    9  # CONFIG_ATH5K_DEBUG=y 
    10  # CONFIG_ATH5K_AHB=y 
    11  CONFIG_ATH9K_HW=m 
     9 CONFIG_ATH9K=m 
     10  
     11 CONFIG_IWLAGN=m 
  • trunk/package/mac80211/patches/030-backport_93c86_eeprom.patch

    r24948 r25749  
    11--- a/include/linux/compat-2.6.36.h 
    22+++ b/include/linux/compat-2.6.36.h 
    3 @@ -101,6 +101,8 @@ int no_printk(const char *s, ...) { retu 
     3@@ -102,6 +102,8 @@ int no_printk(const char *s, ...) { retu 
    44 #define alloc_workqueue(name, flags, max_active) __create_workqueue(name, flags, max_active, 0) 
    55 #endif 
     
    77+#define PCI_EEPROM_WIDTH_93C86   8 
    88+ 
    9  #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,36)) */ 
     9 #define EXTPROC        0200000 
     10 #define TIOCPKT_IOCTL          64 
    1011  
    11  #endif /* LINUX_26_36_COMPAT_H */ 
  • trunk/package/mac80211/patches/110-disable_usb_compat.patch

    r24948 r25749  
    3434--- a/config.mk 
    3535+++ b/config.mk 
    36 @@ -424,7 +424,7 @@ endif #CONFIG_COMPAT_KERNEL_29 
     36@@ -431,7 +431,7 @@ endif #CONFIG_COMPAT_KERNEL_29 
    3737 # This activates a threading fix for usb urb. 
    3838 # this is mainline commit: b3e670443b7fb8a2d29831b62b44a039c283e351 
  • trunk/package/mac80211/patches/120-pr_fmt_warnings.patch

    r24471 r25749  
    99  
    1010 #include <linux/kernel.h> 
    11 --- a/drivers/net/wireless/iwlwifi/iwl3945-base.c 
    12 +++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c 
     11--- a/drivers/net/wireless/iwlegacy/iwl3945-base.c 
     12+++ b/drivers/net/wireless/iwlegacy/iwl3945-base.c 
    1313@@ -27,6 +27,7 @@ 
    1414  * 
     
    8989  
    9090 #include <linux/kernel.h> 
     91--- a/drivers/net/wireless/iwlegacy/iwl4965-base.c 
     92+++ b/drivers/net/wireless/iwlegacy/iwl4965-base.c 
     93@@ -27,6 +27,7 @@ 
     94  * 
     95  *****************************************************************************/ 
     96  
     97+#undef pr_fmt 
     98 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 
     99  
     100 #include <linux/kernel.h> 
  • trunk/package/mac80211/patches/300-ath9k_gpio_settings.patch

    r25425 r25749  
    2727--- a/drivers/net/wireless/ath/ath9k/hw.c 
    2828+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    29 @@ -1213,6 +1213,20 @@ static bool ath9k_hw_channel_change(stru 
     29@@ -1212,6 +1212,20 @@ static bool ath9k_hw_channel_change(stru 
    3030        return true; 
    3131 } 
     
    4848 { 
    4949        int count = 50; 
    50 @@ -1501,6 +1515,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     50@@ -1500,6 +1514,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); 
  • trunk/package/mac80211/patches/407-ath9k-override-mac-address-from-platform-data.patch

    r25093 r25749  
    1919 #include "ath9k.h" 
    2020  
    21 @@ -526,6 +527,7 @@ static void ath9k_init_misc(struct ath_s 
     21@@ -522,6 +523,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 @@ -540,7 +542,7 @@ static int ath9k_init_softc(u16 devid, s 
     29@@ -536,7 +538,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 @@ -576,6 +578,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; 
  • trunk/package/mac80211/patches/409-ath9k_platform_settings.patch

    r25093 r25749  
    11--- a/drivers/net/wireless/ath/ath9k/init.c 
    22+++ b/drivers/net/wireless/ath/ath9k/init.c 
    3 @@ -542,8 +542,14 @@ static int ath9k_init_softc(u16 devid, s 
     3@@ -538,8 +538,14 @@ static int ath9k_init_softc(u16 devid, s 
    44        ah->hw_version.subsysid = subsysid; 
    55        sc->sc_ah = ah; 
  • trunk/package/mac80211/patches/510-ath9k_led_cleanup.patch

    r25425 r25749  
    254254--- a/drivers/net/wireless/ath/ath9k/main.c 
    255255+++ b/drivers/net/wireless/ath/ath9k/main.c 
    256 @@ -1204,9 +1204,6 @@ static void ath9k_stop(struct ieee80211_ 
     256@@ -1216,9 +1216,6 @@ static void ath9k_stop(struct ieee80211_ 
    257257  
    258258        mutex_lock(&sc->mutex); 
     
    266266--- a/drivers/net/wireless/ath/ath9k/init.c 
    267267+++ b/drivers/net/wireless/ath/ath9k/init.c 
    268 @@ -145,6 +145,21 @@ static struct ieee80211_rate ath9k_legac 
     268@@ -141,6 +141,21 @@ static struct ieee80211_rate ath9k_legac 
    269269        RATE(540, 0x0c, 0), 
    270270 }; 
     
    288288  
    289289 /* 
    290 @@ -746,6 +761,13 @@ int ath9k_init_device(u16 devid, struct  
     290@@ -742,6 +757,13 @@ int ath9k_init_device(u16 devid, struct  
    291291  
    292292        ath9k_init_txpower_limits(sc); 
  • trunk/package/mac80211/patches/520-ath9k_intr_mitigation_tweak.patch

    r25425 r25749  
    11--- a/drivers/net/wireless/ath/ath9k/hw.c 
    22+++ b/drivers/net/wireless/ath/ath9k/hw.c 
    3 @@ -1467,8 +1467,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
     3@@ -1466,8 +1466,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st 
    44        REG_WRITE(ah, AR_OBS, 8); 
    55  
  • trunk/package/mac80211/patches/530-mac80211_drv_tim_override.patch

    r25426 r25749  
    11--- a/include/net/mac80211.h 
    22+++ b/include/net/mac80211.h 
    3 @@ -2198,6 +2198,20 @@ static inline int ieee80211_sta_ps_trans 
     3@@ -2209,6 +2209,20 @@ static inline int ieee80211_sta_ps_trans 
    44 #define IEEE80211_TX_STATUS_HEADROOM   13 
    55  
  • trunk/package/mac80211/patches/531-ath9k_fix_ap_ps_buffering.patch

    r25428 r25749  
    11--- a/drivers/net/wireless/ath/ath9k/ath9k.h 
    22+++ b/drivers/net/wireless/ath/ath9k/ath9k.h 
    3 @@ -205,6 +205,7 @@ struct ath_atx_ac { 
     3@@ -203,6 +203,7 @@ struct ath_atx_ac { 
    44        int sched; 
    55        struct list_head list; 
     
    99  
    1010 struct ath_frame_info { 
    11 @@ -262,6 +263,8 @@ struct ath_node { 
     11@@ -260,6 +261,8 @@ struct ath_node { 
    1212        struct ath_atx_ac ac[WME_NUM_AC]; 
    1313        u16 maxampdu; 
     
    1818  
    1919 #define AGGR_CLEANUP         BIT(1) 
    20 @@ -343,6 +346,9 @@ int ath_tx_aggr_start(struct ath_softc * 
     20@@ -341,6 +344,9 @@ int ath_tx_aggr_start(struct ath_softc * 
    2121 void ath_tx_aggr_stop(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); 
    2222 void ath_tx_aggr_resume(struct ath_softc *sc, struct ieee80211_sta *sta, u16 tid); 
     
    5858                         const struct ieee80211_tx_queue_params *params) 
    5959 { 
    60 @@ -2130,6 +2151,7 @@ struct ieee80211_ops ath9k_ops = { 
     60@@ -2191,6 +2212,7 @@ struct ieee80211_ops ath9k_ops = { 
    6161        .configure_filter   = ath9k_configure_filter, 
    6262        .sta_add            = ath9k_sta_add, 
     
    190190 { 
    191191        struct ath_atx_tid *txtid; 
    192 @@ -1492,7 +1569,6 @@ static int setup_tx_flags(struct sk_buff 
     192@@ -1493,7 +1570,6 @@ static int setup_tx_flags(struct sk_buff 
    193193        struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); 
    194194        int flags = 0; 
     
    198198  
    199199        if (tx_info->flags & IEEE80211_TX_CTL_NO_ACK) 
    200 @@ -1755,6 +1831,9 @@ static void ath_tx_start_dma(struct ath_ 
     200@@ -1756,6 +1832,9 @@ static void ath_tx_start_dma(struct ath_ 
    201201                if (txctl->paprd) 
    202202                        bf->bf_state.bfs_paprd_timestamp = jiffies; 
  • trunk/package/mac80211/patches/532-ath9k_remove_pending_frames_workaround.patch

    r25439 r25749  
    11--- a/drivers/net/wireless/ath/ath9k/xmit.c 
    22+++ b/drivers/net/wireless/ath/ath9k/xmit.c 
    3 @@ -2223,33 +2223,6 @@ static void ath_tx_complete_poll_work(st 
     3@@ -2226,33 +2226,6 @@ static void ath_tx_complete_poll_work(st 
    44                                } else { 
    55                                        txq->axq_tx_inprogress = true; 
  • trunk/package/mac80211/patches/540-mac80211_add_rx_rate.patch

    r25441 r25749  
    153153--- a/net/mac80211/rx.c 
    154154+++ b/net/mac80211/rx.c 
    155 @@ -1166,14 +1166,23 @@ ieee80211_rx_h_sta_process(struct ieee80 
     155@@ -1156,14 +1156,23 @@ ieee80211_rx_h_sta_process(struct ieee80 
    156156        if (rx->sdata->vif.type == NL80211_IFTYPE_ADHOC) { 
    157157                u8 *bssid = ieee80211_get_bssid(hdr, rx->skb->len, 
  • trunk/package/mac80211/patches/700-mwl8k-missing-pci-id-for-WNR854T.patch

    r25093 r25749  
    11--- a/drivers/net/wireless/mwl8k.c 
    22+++ b/drivers/net/wireless/mwl8k.c 
    3 @@ -4484,6 +4484,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
     3@@ -4502,6 +4502,7 @@ MODULE_FIRMWARE("mwl8k/fmimage_8366.fw") 
    44 MODULE_FIRMWARE(MWL8K_8366_AP_FW(MWL8K_8366_AP_FW_API)); 
    55  
  • trunk/package/mac80211/patches/800-b43-gpio-mask-module-option.patch

    r24948 r25749  
    3636                mask |= 0x0060; 
    3737                set |= 0x0060; 
    38 @@ -5102,10 +5107,10 @@ static void b43_print_driverinfo(void) 
     38@@ -5100,10 +5105,10 @@ static void b43_print_driverinfo(void) 
    3939        feat_sdio = "S"; 
    4040 #endif 
Note: See TracChangeset for help on using the changeset viewer.