aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorJoe Perches <joe@perches.com>2011-07-29 17:51:25 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-08-09 15:52:00 -0400
commit12c5ffb5c4601a11b08533609d4bf119e2f22cf5 (patch)
tree72815a49da8c031ab7860857d7b164a0954ba7cd /net/wireless/reg.c
parentf74b9d365ddd33a375802b064f96a5d0e99af7c0 (diff)
cfg80211: Update REG_DBG_PRINT macro and uses
Several uses were missing terminating newlines. Typo fix and macro neatening. Signed-off-by: Joe Perches <joe@perches.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 02751dbc5a97..9f3aa5cabdef 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -49,10 +49,8 @@
49#include "nl80211.h" 49#include "nl80211.h"
50 50
51#ifdef CONFIG_CFG80211_REG_DEBUG 51#ifdef CONFIG_CFG80211_REG_DEBUG
52#define REG_DBG_PRINT(format, args...) \ 52#define REG_DBG_PRINT(format, args...) \
53 do { \ 53 printk(KERN_DEBUG pr_fmt(format), ##args)
54 printk(KERN_DEBUG pr_fmt(format), ##args); \
55 } while (0)
56#else 54#else
57#define REG_DBG_PRINT(args...) 55#define REG_DBG_PRINT(args...)
58#endif 56#endif
@@ -890,7 +888,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
890 wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) { 888 wiphy->flags & WIPHY_FLAG_CUSTOM_REGULATORY) {
891 REG_DBG_PRINT("Ignoring regulatory request %s " 889 REG_DBG_PRINT("Ignoring regulatory request %s "
892 "since the driver uses its own custom " 890 "since the driver uses its own custom "
893 "regulatory domain ", 891 "regulatory domain\n",
894 reg_initiator_name(initiator)); 892 reg_initiator_name(initiator));
895 return true; 893 return true;
896 } 894 }
@@ -904,7 +902,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
904 !is_world_regdom(last_request->alpha2)) { 902 !is_world_regdom(last_request->alpha2)) {
905 REG_DBG_PRINT("Ignoring regulatory request %s " 903 REG_DBG_PRINT("Ignoring regulatory request %s "
906 "since the driver requires its own regulatory " 904 "since the driver requires its own regulatory "
907 "domain to be set first", 905 "domain to be set first\n",
908 reg_initiator_name(initiator)); 906 reg_initiator_name(initiator));
909 return true; 907 return true;
910 } 908 }
@@ -1474,7 +1472,7 @@ static void reg_process_pending_hints(void)
1474 /* When last_request->processed becomes true this will be rescheduled */ 1472 /* When last_request->processed becomes true this will be rescheduled */
1475 if (last_request && !last_request->processed) { 1473 if (last_request && !last_request->processed) {
1476 REG_DBG_PRINT("Pending regulatory request, waiting " 1474 REG_DBG_PRINT("Pending regulatory request, waiting "
1477 "for it to be processed..."); 1475 "for it to be processed...\n");
1478 goto out; 1476 goto out;
1479 } 1477 }
1480 1478
@@ -2187,7 +2185,7 @@ out:
2187static void reg_timeout_work(struct work_struct *work) 2185static void reg_timeout_work(struct work_struct *work)
2188{ 2186{
2189 REG_DBG_PRINT("Timeout while waiting for CRDA to reply, " 2187 REG_DBG_PRINT("Timeout while waiting for CRDA to reply, "
2190 "restoring regulatory settings"); 2188 "restoring regulatory settings\n");
2191 restore_regulatory_settings(true); 2189 restore_regulatory_settings(true);
2192} 2190}
2193 2191