aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/atmel/atmel.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-04-13 17:58:51 -0400
committerDavid S. Miller <davem@davemloft.net>2016-04-13 17:58:51 -0400
commit71bbe25d01fa4f35551ff7bffc3e03ddd3e960cd (patch)
treed32c77e506192ef0ba62a10e92aac410eccaa575 /drivers/net/wireless/atmel/atmel.c
parent7d45a04cbc2683f9552572850f1c711d9b96dd26 (diff)
parent57fbcce37be7c1d2622b56587c10ade00e96afa3 (diff)
Merge tag 'mac80211-next-for-davem-2016-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== To synchronize with Kalle, here's just a big change that affects all drivers - removing the duplicated enum ieee80211_band and replacing it by enum nl80211_band. On top of that, just a small documentation update. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/atmel/atmel.c')
-rw-r--r--drivers/net/wireless/atmel/atmel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/atmel/atmel.c b/drivers/net/wireless/atmel/atmel.c
index 6a1f03c271c1..8f8f37f3a00c 100644
--- a/drivers/net/wireless/atmel/atmel.c
+++ b/drivers/net/wireless/atmel/atmel.c
@@ -2434,7 +2434,7 @@ static int atmel_get_range(struct net_device *dev,
2434 2434
2435 /* Values in MHz -> * 10^5 * 10 */ 2435 /* Values in MHz -> * 10^5 * 10 */
2436 range->freq[k].m = 100000 * 2436 range->freq[k].m = 100000 *
2437 ieee80211_channel_to_frequency(i, IEEE80211_BAND_2GHZ); 2437 ieee80211_channel_to_frequency(i, NL80211_BAND_2GHZ);
2438 range->freq[k++].e = 1; 2438 range->freq[k++].e = 1;
2439 } 2439 }
2440 range->num_frequency = k; 2440 range->num_frequency = k;