From e11202246716ad1b3b66f75b9da460b59fad724b Mon Sep 17 00:00:00 2001 From: Priit Laes Date: Sat, 1 Sep 2012 12:06:07 +0300 Subject: [PATCH] --- yaml --- r: 324782 b: refs/heads/master c: 457d404c0abbaf90543e6b8130b805bc824b030a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/csr/unifi_wext.h | 26 +++++--------------------- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/[refs] b/[refs] index 7c87074fce2f..a5c6a23e8eb3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b5008ae2373223d7d6591098754f161594a505ee +refs/heads/master: 457d404c0abbaf90543e6b8130b805bc824b030a diff --git a/trunk/drivers/staging/csr/unifi_wext.h b/trunk/drivers/staging/csr/unifi_wext.h index fc0a06a59cf6..6834c43abfbb 100644 --- a/trunk/drivers/staging/csr/unifi_wext.h +++ b/trunk/drivers/staging/csr/unifi_wext.h @@ -71,15 +71,9 @@ uf_iwe_stream_add_point(struct iw_request_info *info, char *start, char *stop, { char *new_start; - new_start = iwe_stream_add_point( -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined (IW_REQUEST_FLAG_COMPAT) - info, -#endif - start, stop, piwe, extra); + new_start = iwe_stream_add_point(info, start, stop, piwe, extra); if (unlikely(new_start == start)) - { return -E2BIG; - } return (new_start - start); } @@ -91,14 +85,9 @@ uf_iwe_stream_add_event(struct iw_request_info *info, char *start, char *stop, { char *new_start; - new_start = iwe_stream_add_event( -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined(IW_REQUEST_FLAG_COMPAT) - info, -#endif - start, stop, piwe, len); - if (unlikely(new_start == start)) { + new_start = iwe_stream_add_event(info, start, stop, piwe, len); + if (unlikely(new_start == start)) return -E2BIG; - } return (new_start - start); } @@ -109,14 +98,9 @@ uf_iwe_stream_add_value(struct iw_request_info *info, char *stream, char *start, { char *new_start; - new_start = iwe_stream_add_value( -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27) || defined(IW_REQUEST_FLAG_COMPAT) - info, -#endif - stream, start, stop, piwe, len); - if (unlikely(new_start == start)) { + new_start = iwe_stream_add_value(info, stream, start, stop, piwe, len); + if (unlikely(new_start == start)) return -E2BIG; - } return (new_start - start); }