From: John W. Linville <linville@tuxdriver.com>
Date: Mon, 9 Dec 2013 20:30:27 +0000 (-0500)
Subject: Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath
X-Git-Tag: firefly_0821_release~176^2~4570^2~482^2^2~43
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=firefly-linux-kernel-4.4.55.git;a=commitdiff_plain;h=145babc68eebc4d72cd1a92d92e91739b905b7df

Merge tag 'for-linville-20131203' of git://github.com/kvalo/ath

Conflicts:
	drivers/net/wireless/ath/ath10k/htc.c
	drivers/net/wireless/ath/ath10k/mac.c
---

145babc68eebc4d72cd1a92d92e91739b905b7df
diff --cc drivers/net/wireless/ath/ath10k/mac.c
index 06fe2b8fa22d,7d3d3ac2343a..ce9ef3499ecb
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@@ -1356,7 -1482,10 +1482,10 @@@ static int ath10k_update_channel_list(s
  			ch->ht40plus =
  				!(channel->flags & IEEE80211_CHAN_NO_HT40PLUS);
  
+ 			ch->chan_radar =
+ 				!!(channel->flags & IEEE80211_CHAN_RADAR);
+ 
 -			passive = channel->flags & IEEE80211_CHAN_PASSIVE_SCAN;
 +			passive = channel->flags & IEEE80211_CHAN_NO_IR;
  			ch->passive = passive;
  
  			ch->freq = channel->center_freq;