|
|
@@ -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;
|