diff options
author | Sven Neumann <s.neumann@raumfeld.com> | 2011-08-30 17:38:54 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-09-14 13:26:39 -0400 |
commit | d7549cbb9ab0674ef44ea15bd9f9ea1c685adfa6 (patch) | |
tree | ca238c280d3af82ed092903a73130196421e2a95 /net/wireless | |
parent | eac03e381957a05f3842ceb8de987a1025966ecf (diff) |
cfg80211: reorder code to obsolete forward declaration
Reorder functions to remove the need for a forward declaration
introduced by the last commit.
Signed-off-by: Sven Neumann <s.neumann@raumfeld.com>
Cc: John W. Linville <linville@tuxdriver.com>
Cc: Luis R. Rodriguez <mcgrof@gmail.com>
Cc: Daniel Mack <daniel@zonque.org>
Cc: linux-wireless@vger.kernel.org
Acked-by: Luis R. Rodriguez <mcgrof@qca.qualcomm.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r-- | 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 a1f069da79a4..18fc37b6f2bd 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -101,9 +101,6 @@ struct reg_beacon { | |||
101 | struct ieee80211_channel chan; | 101 | struct ieee80211_channel chan; |
102 | }; | 102 | }; |
103 | 103 | ||
104 | static void wiphy_update_regulatory(struct wiphy *wiphy, | ||
105 | enum nl80211_reg_initiator initiator); | ||
106 | |||
107 | static void reg_todo(struct work_struct *work); | 104 | static void reg_todo(struct work_struct *work); |
108 | static DECLARE_WORK(reg_work, reg_todo); | 105 | static DECLARE_WORK(reg_work, reg_todo); |
109 | 106 | ||
@@ -914,14 +911,6 @@ static bool ignore_reg_update(struct wiphy *wiphy, | |||
914 | return false; | 911 | return false; |
915 | } | 912 | } |
916 | 913 | ||
917 | static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) | ||
918 | { | ||
919 | struct cfg80211_registered_device *rdev; | ||
920 | |||
921 | list_for_each_entry(rdev, &cfg80211_rdev_list, list) | ||
922 | wiphy_update_regulatory(&rdev->wiphy, initiator); | ||
923 | } | ||
924 | |||
925 | static void handle_reg_beacon(struct wiphy *wiphy, | 914 | static void handle_reg_beacon(struct wiphy *wiphy, |
926 | unsigned int chan_idx, | 915 | unsigned int chan_idx, |
927 | struct reg_beacon *reg_beacon) | 916 | struct reg_beacon *reg_beacon) |
@@ -1150,6 +1139,14 @@ void regulatory_update(struct wiphy *wiphy, | |||
1150 | mutex_unlock(®_mutex); | 1139 | mutex_unlock(®_mutex); |
1151 | } | 1140 | } |
1152 | 1141 | ||
1142 | static void update_all_wiphy_regulatory(enum nl80211_reg_initiator initiator) | ||
1143 | { | ||
1144 | struct cfg80211_registered_device *rdev; | ||
1145 | |||
1146 | list_for_each_entry(rdev, &cfg80211_rdev_list, list) | ||
1147 | wiphy_update_regulatory(&rdev->wiphy, initiator); | ||
1148 | } | ||
1149 | |||
1153 | static void handle_channel_custom(struct wiphy *wiphy, | 1150 | static void handle_channel_custom(struct wiphy *wiphy, |
1154 | enum ieee80211_band band, | 1151 | enum ieee80211_band band, |
1155 | unsigned int chan_idx, | 1152 | unsigned int chan_idx, |