From 1e2279213754fbb14c07211b6b77e1073cd81ce6 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 10 May 2012 21:25:23 +0200
Subject: [PATCH] --- yaml --- r: 306813 b: refs/heads/master c:
 294a20e039a5125b0e88b96e0ee47065ff4e07a5 h: refs/heads/master i:   306811:
 32bc51cd7aab302efb2f30712ab4a4a8715e5ca2 v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 6 +++---
 trunk/net/wireless/chan.c    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index c5ffbfc26440..3a674ebfdbb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3383b5a69de59eeef2501834c6e0960b7e2bff28
+refs/heads/master: 294a20e039a5125b0e88b96e0ee47065ff4e07a5
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index adb2320bccdf..0289d4ce7070 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -3365,9 +3365,9 @@ void cfg80211_report_obss_beacon(struct wiphy *wiphy,
  * @chan: main channel
  * @channel_type: HT mode
  */
-int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
-				 struct ieee80211_channel *chan,
-				 enum nl80211_channel_type channel_type);
+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
+				  struct ieee80211_channel *chan,
+				  enum nl80211_channel_type channel_type);
 
 /*
  * cfg80211_ch_switch_notify - update wdev channel and notify userspace
diff --git a/trunk/net/wireless/chan.c b/trunk/net/wireless/chan.c
index 2fcfe0993ca2..884801ac4dd0 100644
--- a/trunk/net/wireless/chan.c
+++ b/trunk/net/wireless/chan.c
@@ -45,7 +45,7 @@ rdev_freq_to_chan(struct cfg80211_registered_device *rdev,
 	return chan;
 }
 
-int cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
+bool cfg80211_can_beacon_sec_chan(struct wiphy *wiphy,
 				  struct ieee80211_channel *chan,
 				  enum nl80211_channel_type channel_type)
 {