Changeset 3760

Show
Ignore:
Timestamp:
07/07/08 21:28:08 (4 years ago)
Author:
mentor
Message:

Use iwe_stream_lcp_len instead of IW_EV_LCP_LEN for 2.6.26+
Addendum to r3750
Ticket: #2022

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • madwifi/trunk/net80211/ieee80211_wireless.c

    r3750 r3760  
    17781778 
    17791779#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26) 
    1780 #define iwe_stream_add_event(a, b, c, d, e)   iwe_stream_add_event(b, c, d, e) 
    1781 #define iwe_stream_add_point(a, b, c, d, e)   iwe_stream_add_point(b, c, d, e) 
    1782 #define iwe_stream_add_value(a, b, c, d, e, f)        \ 
     1780#define        iwe_stream_add_event(a, b, c, d, e)    iwe_stream_add_event(b, c, d, e) 
     1781#define        iwe_stream_add_point(a, b, c, d, e)    iwe_stream_add_point(b, c, d, e) 
     1782#define        iwe_stream_add_value(a, b, c, d, e, f) \ 
    17831783        iwe_stream_add_value(b, c, d, e, f) 
     1784#define iwe_stream_lcp_len(...)                 IW_EV_LCP_LEN 
    17841785#endif 
    17851786static int 
     
    18891890        last_ev = current_ev; 
    18901891        iwe.cmd = SIOCGIWRATE; 
    1891         current_val = current_ev + IW_EV_LCP_LEN
     1892        current_val = current_ev + iwe_stream_lcp_len(req->info)
    18921893        /* NB: not sorted, does it matter? */ 
    18931894        for (j = 0; j < se->se_rates[1]; j++) { 
     
    19101911        } 
    19111912        /* remove fixed header if no rates were added */ 
    1912         if ((current_val - current_ev) > IW_EV_LCP_LEN) { 
     1913        if ((current_val - current_ev) > iwe_stream_lcp_len(req->info)) { 
    19131914                current_ev = current_val; 
    19141915        } else {