aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/debugfs.c
diff options
context:
space:
mode:
authorHolger Schurig <hs4233@mail.mn-solutions.de>2007-11-28 11:30:21 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:04:58 -0500
commita7d0adae40d0effc1484261a66fb703eb7e840b5 (patch)
treee3ee3d27bee433c56a57cba2f773ce1533d9b06f /drivers/net/wireless/libertas/debugfs.c
parentdd1d12dabfeb123881b0c813d0b7d3585312bacd (diff)
libertas: remove user-specified channel list
Remove the ability to specify channels to scan via debugfs Signed-off-by: Holger Schurig <hs4233@mail.mn-solutions.de> Acked-by: Dan Williams <dcbw@redhat.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/libertas/debugfs.c')
-rw-r--r--drivers/net/wireless/libertas/debugfs.c38
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index e79236cfdbc1..d3a47cc95475 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -196,43 +196,6 @@ out_unlock:
196 return count; 196 return count;
197} 197}
198 198
199static int lbs_parse_chan(char *buf, size_t count,
200 struct lbs_ioctl_user_scan_cfg *scan_cfg, int dur)
201{
202 char *start, *end, *hold, *str;
203 int i = 0;
204
205 start = strstr(buf, "chan=");
206 if (!start)
207 return -EINVAL;
208 start += 5;
209 end = strchr(start, ' ');
210 if (!end)
211 end = buf + count;
212 hold = kzalloc((end - start)+1, GFP_KERNEL);
213 if (!hold)
214 return -ENOMEM;
215 strncpy(hold, start, end - start);
216 hold[(end-start)+1] = '\0';
217 while(hold && (str = strsep(&hold, ","))) {
218 int chan;
219 char band, passive = 0;
220 sscanf(str, "%d%c%c", &chan, &band, &passive);
221 scan_cfg->chanlist[i].channumber = chan;
222 scan_cfg->chanlist[i].scantype = passive ? 1 : 0;
223 if (band == 'b' || band == 'g')
224 scan_cfg->chanlist[i].radiotype = 0;
225 else if (band == 'a')
226 scan_cfg->chanlist[i].radiotype = 1;
227
228 scan_cfg->chanlist[i].scantime = dur;
229 i++;
230 }
231
232 kfree(hold);
233 return i;
234}
235
236static void lbs_parse_bssid(char *buf, size_t count, 199static void lbs_parse_bssid(char *buf, size_t count,
237 struct lbs_ioctl_user_scan_cfg *scan_cfg) 200 struct lbs_ioctl_user_scan_cfg *scan_cfg)
238{ 201{
@@ -346,7 +309,6 @@ static ssize_t lbs_setuserscan(struct file *file,
346 scan_cfg->bsstype = LBS_SCAN_BSS_TYPE_ANY; 309 scan_cfg->bsstype = LBS_SCAN_BSS_TYPE_ANY;
347 310
348 dur = lbs_parse_dur(buf, count, scan_cfg); 311 dur = lbs_parse_dur(buf, count, scan_cfg);
349 lbs_parse_chan(buf, count, scan_cfg, dur);
350 lbs_parse_bssid(buf, count, scan_cfg); 312 lbs_parse_bssid(buf, count, scan_cfg);
351 scan_cfg->clear_bssid = lbs_parse_clear(buf, count, "clear_bssid="); 313 scan_cfg->clear_bssid = lbs_parse_clear(buf, count, "clear_bssid=");
352 lbs_parse_ssid(buf, count, scan_cfg); 314 lbs_parse_ssid(buf, count, scan_cfg);