Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324782
b: refs/heads/master
c: 457d404
h: refs/heads/master
v: v3
  • Loading branch information
Priit Laes authored and Greg Kroah-Hartman committed Sep 4, 2012
1 parent 2bc3cf0 commit e112022
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 22 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b5008ae2373223d7d6591098754f161594a505ee
refs/heads/master: 457d404c0abbaf90543e6b8130b805bc824b030a
26 changes: 5 additions & 21 deletions trunk/drivers/staging/csr/unifi_wext.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand All @@ -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);
}
Expand All @@ -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);
}
Expand Down

0 comments on commit e112022

Please sign in to comment.