aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/otus/ioctl.c
diff options
context:
space:
mode:
authorAlexander Beregalov <a.beregalov@gmail.com>2008-12-06 22:58:47 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2009-01-06 16:52:11 -0500
commitf4f85ff7255836122fc03f69957cdb02e2530faa (patch)
treedca7e23fdae897778dc5a2c21dbcfc338f63d7d3 /drivers/staging/otus/ioctl.c
parent707eefb8ee714ecaae436980cf19a7e7eb171cf1 (diff)
Staging: otus: remove dependence on kernel version
Dependence on kernel version is not needed anymore if we are in mainline now. Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com> Cc: <lrodriguez@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/otus/ioctl.c')
-rw-r--r--drivers/staging/otus/ioctl.c22
1 files changed, 0 insertions, 22 deletions
diff --git a/drivers/staging/otus/ioctl.c b/drivers/staging/otus/ioctl.c
index 2dbf24afc83..7a5c1e876b0 100644
--- a/drivers/staging/otus/ioctl.c
+++ b/drivers/staging/otus/ioctl.c
@@ -309,9 +309,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
309 iwe.u.ap_addr.sa_family = ARPHRD_ETHER; 309 iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
310 memcpy(iwe.u.ap_addr.sa_data, list->bssid, ETH_ALEN); 310 memcpy(iwe.u.ap_addr.sa_data, list->bssid, ETH_ALEN);
311 current_ev = iwe_stream_add_event( 311 current_ev = iwe_stream_add_event(
312#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
313 info, 312 info,
314#endif
315 current_ev, 313 current_ev,
316 end_buf, &iwe, IW_EV_ADDR_LEN); 314 end_buf, &iwe, IW_EV_ADDR_LEN);
317 315
@@ -332,9 +330,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
332 iwe.cmd = SIOCGIWESSID; 330 iwe.cmd = SIOCGIWESSID;
333 iwe.u.data.flags = 1; 331 iwe.u.data.flags = 1;
334 current_ev = iwe_stream_add_point( 332 current_ev = iwe_stream_add_point(
335#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
336 info, 333 info,
337#endif
338 current_ev, end_buf, &iwe, &list->ssid[2]); 334 current_ev, end_buf, &iwe, &list->ssid[2]);
339 335
340 /* Ran out of buffer */ 336 /* Ran out of buffer */
@@ -355,9 +351,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
355 else 351 else
356 iwe.u.mode = IW_MODE_ADHOC; 352 iwe.u.mode = IW_MODE_ADHOC;
357 current_ev = iwe_stream_add_event( 353 current_ev = iwe_stream_add_event(
358#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
359 info, 354 info,
360#endif
361 current_ev, end_buf, &iwe, IW_EV_UINT_LEN); 355 current_ev, end_buf, &iwe, IW_EV_UINT_LEN);
362 } 356 }
363 357
@@ -389,9 +383,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
389 } 383 }
390 iwe.u.freq.e = 6; 384 iwe.u.freq.e = 6;
391 current_ev = iwe_stream_add_event( 385 current_ev = iwe_stream_add_event(
392#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
393 info, 386 info,
394#endif
395 current_ev, end_buf, &iwe, IW_EV_FREQ_LEN); 387 current_ev, end_buf, &iwe, IW_EV_FREQ_LEN);
396 388
397 /* Ran out of buffer */ 389 /* Ran out of buffer */
@@ -412,9 +404,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
412 iwe.u.qual.noise = 0; 404 iwe.u.qual.noise = 0;
413 iwe.u.qual.qual = list->signalQuality; 405 iwe.u.qual.qual = list->signalQuality;
414 current_ev = iwe_stream_add_event( 406 current_ev = iwe_stream_add_event(
415#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
416 info, 407 info,
417#endif
418 current_ev, end_buf, &iwe, IW_EV_QUAL_LEN); 408 current_ev, end_buf, &iwe, IW_EV_QUAL_LEN);
419 409
420 /* Ran out of buffer */ 410 /* Ran out of buffer */
@@ -435,9 +425,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
435 425
436 iwe.u.data.length = 0; 426 iwe.u.data.length = 0;
437 current_ev = iwe_stream_add_point( 427 current_ev = iwe_stream_add_point(
438#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
439 info, 428 info,
440#endif
441 current_ev, end_buf, &iwe, list->ssid); 429 current_ev, end_buf, &iwe, list->ssid);
442 430
443 /* Ran out of buffer */ 431 /* Ran out of buffer */
@@ -462,9 +450,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
462 iwe.u.bitrate.value = ((list->supportedRates[i+2] & 0x7f) * 500000); 450 iwe.u.bitrate.value = ((list->supportedRates[i+2] & 0x7f) * 500000);
463/* Add new value to event */ 451/* Add new value to event */
464 current_val = iwe_stream_add_value( 452 current_val = iwe_stream_add_value(
465#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
466 info, 453 info,
467#endif
468 current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN); 454 current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN);
469 455
470 /* Ran out of buffer */ 456 /* Ran out of buffer */
@@ -482,9 +468,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
482 iwe.u.bitrate.value = ((list->extSupportedRates[i+2] & 0x7f) * 500000); 468 iwe.u.bitrate.value = ((list->extSupportedRates[i+2] & 0x7f) * 500000);
483/* Add new value to event */ 469/* Add new value to event */
484 current_val = iwe_stream_add_value( 470 current_val = iwe_stream_add_value(
485#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
486 info, 471 info,
487#endif
488 current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN); 472 current_ev, current_val, end_buf, &iwe, IW_EV_PARAM_LEN);
489 473
490 /* Ran out of buffer */ 474 /* Ran out of buffer */
@@ -506,9 +490,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
506 snprintf(buf, sizeof(buf), "bcn_int=%d", (list->beaconInterval[1] << 8) + list->beaconInterval[0]); 490 snprintf(buf, sizeof(buf), "bcn_int=%d", (list->beaconInterval[1] << 8) + list->beaconInterval[0]);
507 iwe.u.data.length = strlen(buf); 491 iwe.u.data.length = strlen(buf);
508 current_ev = iwe_stream_add_point( 492 current_ev = iwe_stream_add_point(
509#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
510 info, 493 info,
511#endif
512 current_ev, end_buf, &iwe, buf); 494 current_ev, end_buf, &iwe, buf);
513 495
514 /* Ran out of buffer */ 496 /* Ran out of buffer */
@@ -537,9 +519,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
537 519
538 if (iwe.u.data.length != 0) 520 if (iwe.u.data.length != 0)
539 current_ev = iwe_stream_add_point( 521 current_ev = iwe_stream_add_point(
540#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
541 info, 522 info,
542#endif
543 current_ev, end_buf, &iwe, buf); 523 current_ev, end_buf, &iwe, buf);
544 524
545 /* Ran out of buffer */ 525 /* Ran out of buffer */
@@ -563,9 +543,7 @@ char *usbdrv_translate_scan(struct net_device *dev,
563 rsn_leader, sizeof(rsn_leader)-1); 543 rsn_leader, sizeof(rsn_leader)-1);
564 if (iwe.u.data.length != 0) 544 if (iwe.u.data.length != 0)
565 current_ev = iwe_stream_add_point( 545 current_ev = iwe_stream_add_point(
566#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,27))
567 info, 546 info,
568#endif
569 current_ev, end_buf, &iwe, buf); 547 current_ev, end_buf, &iwe, buf);
570 548
571 /* Ran out of buffer */ 549 /* Ran out of buffer */