From 653a7850034754742d61eb7b93da9f7b32bf7c01 Mon Sep 17 00:00:00 2001 From: Daniel Golle Date: Tue, 23 Aug 2016 17:58:24 +0200 Subject: [PATCH] fix static_key use in mac80211 patches --- .../922-mac80211_packet_tunnel-linux-4.4.patch | 4 ++-- .../922-mac80211_packet_tunnel-linux-4.8.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.4.patch b/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.4.patch index 8b70df2..bcf0690 100644 --- a/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.4.patch +++ b/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.4.patch @@ -145,7 +145,7 @@ index bcb0a1b..8e2069f 100644 + ret = -EBUSY; + } else { + 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); @@ -166,7 +166,7 @@ index bcb0a1b..8e2069f 100644 + h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx)); + if (h == handler) { + ret = 0; -+ static_key_dec(&mac80211_capwap_wtp); ++ static_key_slow_dec(&mac80211_capwap_wtp); + rcu_assign_pointer(sdata->pcktunnel_handlers, NULL); + } + diff --git a/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.8.patch b/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.8.patch index bad56c5..e7d3ee5 100644 --- a/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.8.patch +++ b/openwrt/mac80211_patches/922-mac80211_packet_tunnel-linux-4.8.patch @@ -145,7 +145,7 @@ index c59af3e..81606a4 100644 + ret = -EBUSY; + } else { + 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); @@ -166,7 +166,7 @@ index c59af3e..81606a4 100644 + h = rcu_dereference_protected(sdata->pcktunnel_handlers, lockdep_is_held(&sdata->local->iflist_mtx)); + if (h == handler) { + ret = 0; -+ static_key_dec(&mac80211_capwap_wtp); ++ static_key_slow_dec(&mac80211_capwap_wtp); + rcu_assign_pointer(sdata->pcktunnel_handlers, NULL); + } +