Changeset 35806


Ignore:
Timestamp:
2013-02-26T16:14:32+01:00 (5 years ago)
Author:
nbd
Message:

rt2x00: prevent device probe errors with CONFIG_MAC80211_MESH disabled (#13080)

Location:
trunk/package/mac80211/patches
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/mac80211/patches/300-pending_work.patch

    r35785 r35806  
    513513        if (!ath9k_hw_set_reset_reg(ah, reset_type)) 
    514514                return false; 
     515--- a/drivers/net/wireless/rt2x00/rt2x00dev.c 
     516+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c 
     517@@ -1236,8 +1236,10 @@ static inline void rt2x00lib_set_if_comb 
     518         */ 
     519        if_limit = &rt2x00dev->if_limits_ap; 
     520        if_limit->max = rt2x00dev->ops->max_ap_intf; 
     521-       if_limit->types = BIT(NL80211_IFTYPE_AP) | 
     522-                       BIT(NL80211_IFTYPE_MESH_POINT); 
     523+       if_limit->types = BIT(NL80211_IFTYPE_AP); 
     524+#ifdef CONFIG_MAC80211_MESH 
     525+       if_limit->types |= BIT(NL80211_IFTYPE_MESH_POINT); 
     526+#endif 
     527  
     528        /* 
     529         * Build up AP interface combinations structure. 
     530@@ -1309,7 +1311,9 @@ int rt2x00lib_probe_dev(struct rt2x00_de 
     531                rt2x00dev->hw->wiphy->interface_modes |= 
     532                    BIT(NL80211_IFTYPE_ADHOC) | 
     533                    BIT(NL80211_IFTYPE_AP) | 
     534+#ifdef CONFIG_MAC80211_MESH 
     535                    BIT(NL80211_IFTYPE_MESH_POINT) | 
     536+#endif 
     537                    BIT(NL80211_IFTYPE_WDS); 
     538  
     539        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; 
  • trunk/package/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch

    r35753 r35806  
    245245--- a/drivers/net/wireless/rt2x00/rt2x00dev.c 
    246246+++ b/drivers/net/wireless/rt2x00/rt2x00dev.c 
    247 @@ -1314,6 +1314,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de 
     247@@ -1318,6 +1318,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de 
    248248  
    249249        rt2x00dev->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; 
     
    256256         * Initialize work. 
    257257         */ 
    258 @@ -1438,6 +1442,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ 
     258@@ -1442,6 +1446,11 @@ void rt2x00lib_remove_dev(struct rt2x00_ 
    259259         */ 
    260260        if (rt2x00dev->drv_data) 
Note: See TracChangeset for help on using the changeset viewer.