aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhao, Gang <gamerh2o@gmail.com>2014-03-08 11:01:24 +0800
committerJohannes Berg <johannes.berg@intel.com>2014-03-19 21:29:56 +0100
commit2316d7b0544c4601cc852c801c93d1f451378740 (patch)
tree30e25953926c0f6e967217e4abb0d650516148a3
parenta0f995a561d90636120bce2e89157b537a174c92 (diff)
downloadmac80211-next-csa-2316d7b0544c4601cc852c801c93d1f451378740.tar.gz
cfg80211: make __cfg80211_join_ibss() static
Function __cfg80211_join_ibss() is only used in net/wireless/ibss.c, so make it static. Signed-off-by: Zhao, Gang <gamerh2o@gmail.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--net/wireless/core.h4
-rw-r--r--net/wireless/ibss.c8
2 files changed, 4 insertions, 8 deletions
diff --git a/net/wireless/core.h b/net/wireless/core.h
index 3975ffa8feb25..579149d0ea34f 100644
--- a/net/wireless/core.h
+++ b/net/wireless/core.h
@@ -246,10 +246,6 @@ void cfg80211_bss_age(struct cfg80211_registered_device *dev,
unsigned long age_secs);
/* IBSS */
-int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
- struct net_device *dev,
- struct cfg80211_ibss_params *params,
- struct cfg80211_cached_keys *connkeys);
int cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
struct net_device *dev,
struct cfg80211_ibss_params *params,
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c
index 349db9ddc0d13..a6b5bdad039c7 100644
--- a/net/wireless/ibss.c
+++ b/net/wireless/ibss.c
@@ -82,10 +82,10 @@ void cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid,
}
EXPORT_SYMBOL(cfg80211_ibss_joined);
-int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
- struct net_device *dev,
- struct cfg80211_ibss_params *params,
- struct cfg80211_cached_keys *connkeys)
+static int __cfg80211_join_ibss(struct cfg80211_registered_device *rdev,
+ struct net_device *dev,
+ struct cfg80211_ibss_params *params,
+ struct cfg80211_cached_keys *connkeys)
{
struct wireless_dev *wdev = dev->ieee80211_ptr;
struct ieee80211_channel *check_chan;