Changeset 30396


Ignore:
Timestamp:
2012-02-09T15:24:15+01:00 (5 years ago)
Author:
nbd
Message:

mac80211: merge a LED related locking fix

File:
1 edited

Legend:

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

    r30388 r30396  
    265265  
    266266        ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb); 
     267--- a/net/mac80211/main.c 
     268+++ b/net/mac80211/main.c 
     269@@ -915,6 +915,8 @@ int ieee80211_register_hw(struct ieee802 
     270                wiphy_debug(local->hw.wiphy, "Failed to initialize wep: %d\n", 
     271                            result); 
     272  
     273+       ieee80211_led_init(local); 
     274+ 
     275        rtnl_lock(); 
     276  
     277        result = ieee80211_init_rate_ctrl_alg(local, 
     278@@ -936,8 +938,6 @@ int ieee80211_register_hw(struct ieee802 
     279  
     280        rtnl_unlock(); 
     281  
     282-       ieee80211_led_init(local); 
     283- 
     284        local->network_latency_notifier.notifier_call = 
     285                ieee80211_max_network_latency; 
     286        result = pm_qos_add_notifier(PM_QOS_NETWORK_LATENCY, 
Note: See TracChangeset for help on using the changeset viewer.