mac80211: remove underscores from some key functions

Some key function don't exist without underscores, so
remove the underscores from those.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index c2d4bf24a8c25bd6b06e19584dbc1d86dd0a21e3..e5c1441ac2b8c34719a3d684a8d6537dac9c91fa 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -252,7 +252,7 @@ static int ieee80211_del_key(struct wiphy *wiphy, struct net_device *dev,
                goto out_unlock;
        }
 
-       __ieee80211_key_free(key, true);
+       ieee80211_key_free(key, true);
 
        ret = 0;
  out_unlock:

diff --git a/net/mac80211/key.c b/net/mac80211/key.c
index d86be6466724a80d008de0eb90d123142a54c01e..953887bdc638a69a3aed9ece545ca8360e43528b 100644 (file)
--- a/net/mac80211/key.c
+++ b/net/mac80211/key.c
@@ -248,11 +248,11 @@ void ieee80211_set_default_mgmt_key(struct ieee80211_sub_if_data *sdata,
 }
 
 
-static void __ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
-                                   struct sta_info *sta,
-                                   bool pairwise,
-                                   struct ieee80211_key *old,
-                                   struct ieee80211_key *new)
+static void ieee80211_key_replace(struct ieee80211_sub_if_data *sdata,
+                                 struct sta_info *sta,
+                                 bool pairwise,
+                                 struct ieee80211_key *old,
+                                 struct ieee80211_key *new)
 {
        int idx;
        bool defunikey, defmultikey, defmgmtkey;
@@ -406,8 +406,8 @@ static void ieee80211_key_free_common(struct ieee80211_key *key)
        kfree(key);
 }
 
-static void __ieee80211_key_destroy(struct ieee80211_key *key,
-                                   bool delay_tailroom)
+static void ieee80211_key_destroy(struct ieee80211_key *key,
+                                 bool delay_tailroom)
 {
        if (!key)
                return;
@@ -473,22 +473,22 @@ int ieee80211_key_link(struct ieee80211_key *key,
 
        increment_tailroom_need_count(sdata);
 
-       __ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
-       __ieee80211_key_destroy(old_key, true);
+       ieee80211_key_replace(sdata, sta, pairwise, old_key, key);
+       ieee80211_key_destroy(old_key, true);
 
        ieee80211_debugfs_key_add(key);
 
        ret = ieee80211_key_enable_hw_accel(key);
 
        if (ret)
-               __ieee80211_key_free(key, true);
+               ieee80211_key_free(key, true);
 
        mutex_unlock(&sdata->local->key_mtx);
 
        return ret;
 }
 
-void __ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
+void ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
 {
        if (!key)
                return;
@@ -497,10 +497,10 @@ void __ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom)
         * Replace key with nothingness if it was ever used.
         */
        if (key->sdata)
-               __ieee80211_key_replace(key->sdata, key->sta,
+               ieee80211_key_replace(key->sdata, key->sta,
                                key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE,
                                key, NULL);
-       __ieee80211_key_destroy(key, delay_tailroom);
+       ieee80211_key_destroy(key, delay_tailroom);
 }
 
 void ieee80211_enable_keys(struct ieee80211_sub_if_data *sdata)
@@ -572,7 +572,7 @@ void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata)
        ieee80211_debugfs_key_remove_mgmt_default(sdata);
 
        list_for_each_entry_safe(key, tmp, &sdata->key_list, list)
-               __ieee80211_key_free(key, false);
+               ieee80211_key_free(key, false);
 
        ieee80211_debugfs_key_update_default(sdata);
 

diff --git a/net/mac80211/key.h b/net/mac80211/key.h
index 8ef56cdfe3d7f11de943fa7e639566088393705a..a353ddd63b5b9fd13e04c3a5f3c5e29bcb498339 100644 (file)
--- a/net/mac80211/key.h
+++ b/net/mac80211/key.h
@@ -134,7 +134,7 @@ struct ieee80211_key *ieee80211_key_alloc(u32 cipher, int idx, size_t key_len,
 int ieee80211_key_link(struct ieee80211_key *key,
                       struct ieee80211_sub_if_data *sdata,
                       struct sta_info *sta);
-void __ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom);
+void ieee80211_key_free(struct ieee80211_key *key, bool delay_tailroom);
 void ieee80211_key_free_unused(struct ieee80211_key *key);
 void ieee80211_set_default_key(struct ieee80211_sub_if_data *sdata, int idx,
                               bool uni, bool multi);

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index a36ceedf53b30ad4a90ffa473d1dd6b9af366722..2961f3d6b209c19fe2c1284b2dbc92b0186bdfe7 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -812,11 +812,11 @@ int __must_check __sta_info_destroy(struct sta_info *sta)
 
        mutex_lock(&local->key_mtx);
        for (i = 0; i < NUM_DEFAULT_KEYS; i++)
-               __ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]),
-                                    true);
+               ieee80211_key_free(key_mtx_dereference(local, sta->gtk[i]),
+                                  true);
        if (sta->ptk)
-               __ieee80211_key_free(key_mtx_dereference(local, sta->ptk),
-                                    true);
+               ieee80211_key_free(key_mtx_dereference(local, sta->ptk),
+                                  true);
        mutex_unlock(&local->key_mtx);
 
        sta->dead = true;