Merge tag 'sunxi-late-for-4.2' of https://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / net / mac80211 / rate.c

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 36ba7c4f028305ec05d055e1575f5a857ac3d110..fda33f961d83ce44f05ab3298113877d01768fb2 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -103,7 +103,7 @@ ieee80211_rate_control_ops_get(const char *name)
        const struct rate_control_ops *ops;
        const char *alg_name;
 
-       kparam_block_sysfs_write(ieee80211_default_rc_algo);
+       kernel_param_lock(THIS_MODULE);
        if (!name)
                alg_name = ieee80211_default_rc_algo;
        else
@@ -117,7 +117,7 @@ ieee80211_rate_control_ops_get(const char *name)
        /* try built-in one if specific alg requested but not found */
        if (!ops && strlen(CONFIG_MAC80211_RC_DEFAULT))
                ops = ieee80211_try_rate_control_ops_get(CONFIG_MAC80211_RC_DEFAULT);
-       kparam_unblock_sysfs_write(ieee80211_default_rc_algo);
+       kernel_param_unlock(THIS_MODULE);
 
        return ops;
 }