Changeset 20674


Ignore:
Timestamp:
2010-04-03T16:30:50+02:00 (6 years ago)
Author:
juhosg
Message:

mac80211: update rt2x00 mcu patch (thanks to Luis Correia)

Location:
trunk/package/mac80211
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/Makefile

    r20650 r20674  
    1212 
    1313PKG_VERSION:=2010-03-24 
    14 PKG_RELEASE:=5 
     14PKG_RELEASE:=6 
    1515PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources 
    1616#       http://www.orbit-lab.org/kernel/compat-wireless-2.6/2010/11 \ 
  • trunk/package/mac80211/patches/602-rt2x00-remove-mcu-requests-for-soc.patch

    r20650 r20674  
     1From f18d4463d092162f34a8bd226505627ceeac3e8a Mon Sep 17 00:00:00 2001 
     2From: Luis Correia <luis.f.correia@gmail.com> 
     3Date: Sat, 3 Apr 2010 12:49:53 +0100 
     4Subject: [PATCH] rt2x00: remove MCU requests for SoC platforms 
     5 
    16The ralink SoC platforms do not have an MCU. 
    27 
    38Signed-off-by: Luis Correia <luis.f.correia@gmail.com> 
     9Acked-by: Ivo van Doorn <IvDoorn@gmail.com> 
     10Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com> 
    411--- 
     12 drivers/net/wireless/rt2x00/rt2800pci.c |    6 ++++++ 
     13 1 files changed, 6 insertions(+), 0 deletions(-) 
    514 
    6 --- a/drivers/net/wireless/rt2x00/rt2800lib.c 
    7 +++ b/drivers/net/wireless/rt2x00/rt2800lib.c 
    8 @@ -221,9 +221,9 @@ void rt2800_mcu_request(struct rt2x00_de 
    9         u32 reg; 
    10   
    11         /* 
    12 -        * SOC devices don't support MCU requests. 
    13 +        * some devices don't support MCU requests. 
    14          */ 
    15 -       if (rt2x00_is_soc(rt2x00dev)) 
    16 +       if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags)) 
    17                 return; 
    18   
    19         mutex_lock(&rt2x00dev->csr_mutex); 
    2015--- a/drivers/net/wireless/rt2x00/rt2800pci.c 
    2116+++ b/drivers/net/wireless/rt2x00/rt2800pci.c 
     
    2520  
    2621+       /* 
    27 +        * some devices don't support MCU requests. 
     22+        * SOC devices don't support MCU requests. 
    2823+        */ 
    29 +       if (!test_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags)) 
     24+       if (rt2x00_is_soc(rt2x00dev)) 
    3025+               return; 
    3126+ 
     
    3328                rt2800_register_read(rt2x00dev, H2M_MAILBOX_CID, &reg); 
    3429  
    35 @@ -1098,10 +1104,12 @@ static int rt2800pci_probe_hw(struct rt2 
    36         __set_bit(DRIVER_SUPPORT_CONTROL_FILTER_PSPOLL, &rt2x00dev->flags); 
    37   
    38         /* 
    39 -        * This device requires firmware. 
    40 +        * This device requires firmware and MCU access. 
    41          */ 
    42 -       if (!rt2x00_is_soc(rt2x00dev)) 
    43 +       if (!rt2x00_is_soc(rt2x00dev)){ 
    44                 __set_bit(DRIVER_REQUIRE_FIRMWARE, &rt2x00dev->flags); 
    45 +               __set_bit(DRIVER_REQUIRE_MCU, &rt2x00dev->flags); 
    46 +       } 
    47         __set_bit(DRIVER_REQUIRE_DMA, &rt2x00dev->flags); 
    48         __set_bit(DRIVER_REQUIRE_L2PAD, &rt2x00dev->flags); 
    49         if (!modparam_nohwcrypt) 
    50 --- a/drivers/net/wireless/rt2x00/rt2x00.h 
    51 +++ b/drivers/net/wireless/rt2x00/rt2x00.h 
    52 @@ -631,6 +631,7 @@ enum rt2x00_flags { 
    53          * Driver requirements 
    54          */ 
    55         DRIVER_REQUIRE_FIRMWARE, 
    56 +       DRIVER_REQUIRE_MCU, 
    57         DRIVER_REQUIRE_BEACON_GUARD, 
    58         DRIVER_REQUIRE_ATIM_QUEUE, 
    59         DRIVER_REQUIRE_DMA, 
Note: See TracChangeset for help on using the changeset viewer.