Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca...

[pandora-kernel.git] / net / wireless / reg.c

diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1ad0f39..9f3aa5c 100644 (file)
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -49,10 +49,8 @@
 #include "nl80211.h"
 
 #ifdef CONFIG_CFG80211_REG_DEBUG
-#define REG_DBG_PRINT(format, args...) \
-       do { \
-               printk(KERN_DEBUG pr_fmt(format), ##args);      \
-       } while (0)
+#define REG_DBG_PRINT(format, args...)                 \
+       printk(KERN_DEBUG pr_fmt(format), ##args)
 #else
 #define REG_DBG_PRINT(args...)
 #endif
@@ -890,7 +888,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
            wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
                REG_DBG_PRINT("Ignoring regulatory request %s "
                              "since the driver uses its own custom "
-                             "regulatory domain ",
+                             "regulatory domain\n",
                              reg_initiator_name(initiator));
                return true;
        }
@@ -903,8 +901,8 @@ static bool ignore_reg_update(struct wiphy *wiphy,
            initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
            !is_world_regdom(last_request->alpha2)) {
                REG_DBG_PRINT("Ignoring regulatory request %s "
-                             "since the driver requires its own regulaotry "
-                             "domain to be set first",
+                             "since the driver requires its own regulatory "
+                             "domain to be set first\n",
                              reg_initiator_name(initiator));
                return true;
        }
@@ -1125,12 +1123,13 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
        enum ieee80211_band band;
 
        if (ignore_reg_update(wiphy, initiator))
-               goto out;
+               return;
+
        for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
                if (wiphy->bands[band])
                        handle_band(wiphy, band, initiator);
        }
-out:
+
        reg_process_beacons(wiphy);
        reg_process_ht_flags(wiphy);
        if (wiphy->reg_notifier)
@@ -1473,7 +1472,7 @@ static void reg_process_pending_hints(void)
        /* When last_request->processed becomes true this will be rescheduled */
        if (last_request && !last_request->processed) {
                REG_DBG_PRINT("Pending regulatory request, waiting "
-                             "for it to be processed...");
+                             "for it to be processed...\n");
                goto out;
        }
 
@@ -2186,7 +2185,7 @@ out:
 static void reg_timeout_work(struct work_struct *work)
 {
        REG_DBG_PRINT("Timeout while waiting for CRDA to reply, "
-                     "restoring regulatory settings");
+                     "restoring regulatory settings\n");
        restore_regulatory_settings(true);
 }