atmel: replace function ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}

Replace ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan} with more
generic ieee80211_{channel_to_frequency, frequency_to_channel}.

Include <net/cfg80211.h> for the defination of IEEE80211_BAND_2GHZ.
Because <net/cfg80211.h> includes <linux/ieee80211.h>, so we can
replace <linux/ieee80211.h> with <net/cfg80211.h>.

This change is a preparation for the removal of function
ieee80211_{dsss_chan_to_freq, freq_to_dsss_chan}.

Cc: Simon Kelley <simon@thekelleys.org.uk>
Signed-off-by: Zhao, Gang <gamerh2o@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index bf93ea859f2d7f1fc05257a86a0b5b1525dd62c3..1fe41af81a597a4a90c75aac5557567725b09fc5 100644 (file)
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -67,7 +67,7 @@
 #include <linux/moduleparam.h>
 #include <linux/firmware.h>
 #include <linux/jiffies.h>
-#include <linux/ieee80211.h>
+#include <net/cfg80211.h>
 #include "atmel.h"
 
 #define DRIVER_MAJOR 0
@@ -2273,7 +2273,7 @@ static int atmel_set_freq(struct net_device *dev,
 
                /* Hack to fall through... */
                fwrq->e = 0;
-               fwrq->m = ieee80211_freq_to_dsss_chan(f);
+               fwrq->m = ieee80211_frequency_to_channel(f);
        }
        /* Setting by channel number */
        if ((fwrq->m > 1000) || (fwrq->e > 0))
@@ -2434,8 +2434,8 @@ static int atmel_get_range(struct net_device *dev,
                        range->freq[k].i = i; /* List index */
 
                        /* Values in MHz -> * 10^5 * 10 */
-                       range->freq[k].m = (ieee80211_dsss_chan_to_freq(i) *
-                                           100000);
+                       range->freq[k].m = 100000 *
+                        ieee80211_channel_to_frequency(i, IEEE80211_BAND_2GHZ);
                        range->freq[k++].e = 1;
                }
                range->num_frequency = k;