aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/agg-tx.c4
-rw-r--r--net/wireless/reg.c6
2 files changed, 5 insertions, 5 deletions
diff --git a/net/mac80211/agg-tx.c b/net/mac80211/agg-tx.c
index 5538e1b4a697..bb4ac70fc97a 100644
--- a/net/mac80211/agg-tx.c
+++ b/net/mac80211/agg-tx.c
@@ -414,7 +414,7 @@ static void ieee80211_agg_tx_operational(struct ieee80211_local *local,
414 struct sta_info *sta, u16 tid) 414 struct sta_info *sta, u16 tid)
415{ 415{
416#ifdef CONFIG_MAC80211_HT_DEBUG 416#ifdef CONFIG_MAC80211_HT_DEBUG
417 printk(KERN_DEBUG "Aggregation is on for tid %d \n", tid); 417 printk(KERN_DEBUG "Aggregation is on for tid %d\n", tid);
418#endif 418#endif
419 419
420 spin_lock(&local->ampdu_lock); 420 spin_lock(&local->ampdu_lock);
@@ -674,7 +674,7 @@ void ieee80211_process_addba_resp(struct ieee80211_local *local,
674 del_timer(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer); 674 del_timer(&sta->ampdu_mlme.tid_tx[tid]->addba_resp_timer);
675 675
676#ifdef CONFIG_MAC80211_HT_DEBUG 676#ifdef CONFIG_MAC80211_HT_DEBUG
677 printk(KERN_DEBUG "switched off addBA timer for tid %d \n", tid); 677 printk(KERN_DEBUG "switched off addBA timer for tid %d\n", tid);
678#endif /* CONFIG_MAC80211_HT_DEBUG */ 678#endif /* CONFIG_MAC80211_HT_DEBUG */
679 679
680 if (le16_to_cpu(mgmt->u.action.u.addba_resp.status) 680 if (le16_to_cpu(mgmt->u.action.u.addba_resp.status)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index ed89c59bb431..e857d72c7e8c 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -2357,10 +2357,10 @@ static void print_regdomain(const struct ieee80211_regdomain *rd)
2357 rdev->country_ie_alpha2[1]); 2357 rdev->country_ie_alpha2[1]);
2358 } else 2358 } else
2359 printk(KERN_INFO "cfg80211: Current regulatory " 2359 printk(KERN_INFO "cfg80211: Current regulatory "
2360 "domain intersected: \n"); 2360 "domain intersected:\n");
2361 } else 2361 } else
2362 printk(KERN_INFO "cfg80211: Current regulatory " 2362 printk(KERN_INFO "cfg80211: Current regulatory "
2363 "domain intersected: \n"); 2363 "domain intersected:\n");
2364 } else if (is_world_regdom(rd->alpha2)) 2364 } else if (is_world_regdom(rd->alpha2))
2365 printk(KERN_INFO "cfg80211: World regulatory " 2365 printk(KERN_INFO "cfg80211: World regulatory "
2366 "domain updated:\n"); 2366 "domain updated:\n");