cfg80211: remove function reg_process_beacons()

Commit Message

Gang ZHAO Dec. 18, 2013, 12:56 p.m. UTC

Since pointer last_request is initialized to &core_request_world, the
if check in reg_process_beacons() is useless, and
reg_process_beacons() is only called by wiphy_update_regulatory(), so
we can let wiphy_update_regulatory() calls wiphy_update_beacon_reg()
directly and remove unnecesssary reg_process_beacons().

Signed-off-by: ZHAO Gang <[e-mail]>
---
 net/wireless/reg.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

Patch

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index ec54e1a..b833bea 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1163,18 +1163,6 @@  static void wiphy_update_beacon_reg(struct wiphy *wiphy)
 	}
 }
 
-/* Reap the advantages of previously found beacons */
-static void reg_process_beacons(struct wiphy *wiphy)
-{
-	/*
-	 * Means we are just firing up cfg80211, so no beacons would
-	 * have been processed yet.
-	 */
-	if (!last_request)
-		return;
-	wiphy_update_beacon_reg(wiphy);
-}
-
 static bool is_ht40_allowed(struct ieee80211_channel *chan)
 {
 	if (!chan)
@@ -1281,7 +1269,7 @@  static void wiphy_update_regulatory(struct wiphy *wiphy,
 	for (band = 0; band < IEEE80211_NUM_BANDS; band++)
 		handle_band(wiphy, initiator, wiphy->bands[band]);
 
-	reg_process_beacons(wiphy);
+	wiphy_update_beacon_reg(wiphy);
 	reg_process_ht_flags(wiphy);
 	reg_call_notifier(wiphy, lr);
 }