Merge git://git.infradead.org/battery-2.6

[karo-tx-linux.git] / net / wireless / chan.c

diff --git a/net/wireless/chan.c b/net/wireless/chan.c
index 17cd0c04d139045bbb0802a74d9628731d9428dc..2fcfe0993ca221cb20e0739d4c1774fa22593cbd 100644 (file)
--- a/net/wireless/chan.c
+++ b/net/wireless/chan.c
@@ -6,6 +6,7 @@
  * Copyright 2009      Johannes Berg <johannes@sipsolutions.net>
  */
 
+#include <linux/export.h>
 #include <net/cfg80211.h>
 #include "core.h"
 
@@ -44,9 +45,9 @@ rdev_freq_to_chan(struct cfg80211_registered_device *rdev,
        return chan;
 }
 
-static bool can_beacon_sec_chan(struct wiphy *wiphy,
-                               struct ieee80211_channel *chan,
-                               enum nl80211_channel_type channel_type)
+int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
+                                 struct ieee80211_channel *chan,
+                                 enum nl80211_channel_type channel_type)
 {
        struct ieee80211_channel *sec_chan;
        int diff;
@@ -75,6 +76,7 @@ static bool can_beacon_sec_chan(struct wiphy *wiphy,
 
        return true;
 }
+EXPORT_SYMBOL(cfg80211_can_beacon_sec_chan);
 
 int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
                      struct wireless_dev *wdev, int freq,
@@ -109,8 +111,8 @@ int cfg80211_set_freq(struct cfg80211_registered_device *rdev,
                switch (channel_type) {
                case NL80211_CHAN_HT40PLUS:
                case NL80211_CHAN_HT40MINUS:
-                       if (!can_beacon_sec_chan(&rdev->wiphy, chan,
-                                                channel_type)) {
+                       if (!cfg80211_can_beacon_sec_chan(&rdev->wiphy, chan,
+                                                         channel_type)) {
                                printk(KERN_DEBUG
                                       "cfg80211: Secondary channel not "
                                       "allowed to initiate communication\n");