[PATCH 2/2] cfg80211: reorder code to obsolete forward declaration
From: Sven Neumann <hidden>
Date: 2011-08-30 21:49:10
Subsystem:
802.11 (including cfg80211/nl80211), the rest · Maintainers:
Johannes Berg, Linus Torvalds
Reorder functions to remove the need for a forward declaration introduced by the last commit. Signed-off-by: Sven Neumann <redacted> Cc: John W. Linville <redacted> Cc: Luis R. Rodriguez <redacted> Cc: Daniel Mack <daniel@zonque.org> Cc: linux-wireless@vger.kernel.org --- net/wireless/reg.c | 19 ++++++++----------- 1 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index c50016e..c77928b 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c@@ -103,9 +103,6 @@ struct reg_beacon { struct ieee80211_channel chan; }; -static void wiphy_update_regulatory(struct wiphy *wiphy, - enum nl80211_reg_initiator initiator); - static void reg_todo(struct work_struct *work); static DECLARE_WORK(reg_work, reg_todo);
@@ -915,14 +912,6 @@ static bool ignore_reg_update(struct wiphy *wiphy, return false; } -static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) -{ - struct cfg80211_registered_device *rdev; - - list_for_each_entry(rdev, &cfg80211_rdev_list, list) - wiphy_update_regulatory(&rdev->wiphy, initiator); -} - static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx, struct reg_beacon *reg_beacon)
@@ -1151,6 +1140,14 @@ void regulatory_update(struct wiphy *wiphy, mutex_unlock(®_mutex); } +static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) +{ + struct cfg80211_registered_device *rdev; + + list_for_each_entry(rdev, &cfg80211_rdev_list, list) + wiphy_update_regulatory(&rdev->wiphy, initiator); +} + static void handle_channel_custom(struct wiphy *wiphy, enum ieee80211_band band, unsigned int chan_idx,
--
1.7.4.1