7u83/freewtp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix static_key use in mac80211 patches

Browse Source
This commit is contained in:
Daniel Golle 2016-08-23 17:58:24 +02:00
parent 9138408fa6
commit 653a785003
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.4.patch
View File

@ -145,7 +145,7 @@ index bcb0a1b..8e2069f 100644
+ ret = -EBUSY; + ret = -EBUSY;
+ } else { + } else {
+ rcu_assign_pointer(sdata->pcktunnel_handlers, handler); + rcu_assign_pointer(sdata->pcktunnel_handlers, handler);
+ static_key_inc(&mac80211_capwap_wtp); + static_key_slow_inc(&mac80211_capwap_wtp);
+ } + }
+ +
+ mutex_unlock(&sdata->local->iflist_mtx); + mutex_unlock(&sdata->local->iflist_mtx);
@ -166,7 +166,7 @@ index bcb0a1b..8e2069f 100644
+ h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx)); + h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx));
+ if (h == handler) { + if (h == handler) {
+ ret = 0; + ret = 0;
+ static_key_dec(&mac80211_capwap_wtp); + static_key_slow_dec(&mac80211_capwap_wtp);
+ rcu_assign_pointer(sdata->pcktunnel_handlers, NULL); + rcu_assign_pointer(sdata->pcktunnel_handlers, NULL);
+ } + }
+ +

4
openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.8.patch
View File

@ -145,7 +145,7 @@ index c59af3e..81606a4 100644
+ ret = -EBUSY; + ret = -EBUSY;
+ } else { + } else {
+ rcu_assign_pointer(sdata->pcktunnel_handlers, handler); + rcu_assign_pointer(sdata->pcktunnel_handlers, handler);
+ static_key_inc(&mac80211_capwap_wtp); + static_key_slow_inc(&mac80211_capwap_wtp);
+ } + }
+ +
+ mutex_unlock(&sdata->local->iflist_mtx); + mutex_unlock(&sdata->local->iflist_mtx);
@ -166,7 +166,7 @@ index c59af3e..81606a4 100644
+ h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx)); + h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx));
+ if (h == handler) { + if (h == handler) {
+ ret = 0; + ret = 0;
+ static_key_dec(&mac80211_capwap_wtp); + static_key_slow_dec(&mac80211_capwap_wtp);
+ rcu_assign_pointer(sdata->pcktunnel_handlers, NULL); + rcu_assign_pointer(sdata->pcktunnel_handlers, NULL);
+ } + }
+ +