diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:44:45 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-08 11:44:45 -0700 |
| commit | ce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f (patch) | |
| tree | 5f65b06399130f12a6cfc59cd450a205d2cd0036 /drivers/staging/brcm80211/include/wlioctl.h | |
| parent | 3ea2f4d640479a40847e311282ee73695b6e82cf (diff) | |
| download | linux-ce0f1b8cd1526e800b8f3c1e978ac7c23ed91e2f.tar.gz | |
Staging: brcm80211: remove OFFSETOF macro
Use the real 'offsetof' definition instead.
Cc: Brett Rudley <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Nohee Ko <noheek@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/include/wlioctl.h')
| -rw-r--r-- | drivers/staging/brcm80211/include/wlioctl.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/staging/brcm80211/include/wlioctl.h b/drivers/staging/brcm80211/include/wlioctl.h index b5facdb53d04..22227c1a7fb0 100644 --- a/drivers/staging/brcm80211/include/wlioctl.h +++ b/drivers/staging/brcm80211/include/wlioctl.h @@ -254,7 +254,7 @@ typedef struct wl_iscan_params { } wl_iscan_params_t; /* 3 fields + size of wl_scan_params, not including variable length array */ -#define WL_ISCAN_PARAMS_FIXED_SIZE (OFFSETOF(wl_iscan_params_t, params) + sizeof(wlc_ssid_t)) +#define WL_ISCAN_PARAMS_FIXED_SIZE (offsetof(wl_iscan_params_t, params) + sizeof(wlc_ssid_t)) typedef struct wl_scan_results { u32 buflen; @@ -282,7 +282,7 @@ typedef struct wl_escan_params { wl_scan_params_t params; } wl_escan_params_t; -#define WL_ESCAN_PARAMS_FIXED_SIZE (OFFSETOF(wl_escan_params_t, params) + sizeof(wlc_ssid_t)) +#define WL_ESCAN_PARAMS_FIXED_SIZE (offsetof(wl_escan_params_t, params) + sizeof(wlc_ssid_t)) typedef struct wl_escan_result { u32 buflen; @@ -302,7 +302,7 @@ typedef struct wl_iscan_results { /* size of wl_iscan_results not including variable length array */ #define WL_ISCAN_RESULTS_FIXED_SIZE \ - (WL_SCAN_RESULTS_FIXED_SIZE + OFFSETOF(wl_iscan_results_t, results)) + (WL_SCAN_RESULTS_FIXED_SIZE + offsetof(wl_iscan_results_t, results)) typedef struct wl_probe_params { wlc_ssid_t ssid; @@ -490,7 +490,7 @@ typedef struct wl_rm_req { void *cb_arg; /* arg to completion callback function */ wl_rm_req_elt_t req[1]; /* variable length block of requests */ } wl_rm_req_t; -#define WL_RM_REQ_FIXED_LEN OFFSETOF(wl_rm_req_t, req) +#define WL_RM_REQ_FIXED_LEN offsetof(wl_rm_req_t, req) typedef struct wl_rm_rep_elt { s8 type; @@ -720,7 +720,7 @@ typedef struct { u32 rx_decrypt_failures; /* # of packet decrypted unsuccessfully */ } sta_info_t; -#define WL_OLD_STAINFO_SIZE OFFSETOF(sta_info_t, tx_pkts) +#define WL_OLD_STAINFO_SIZE offsetof(sta_info_t, tx_pkts) #define WL_STA_VER 3 @@ -1949,8 +1949,8 @@ typedef struct wl_pkt_filter { } u; } wl_pkt_filter_t; -#define WL_PKT_FILTER_FIXED_LEN OFFSETOF(wl_pkt_filter_t, u) -#define WL_PKT_FILTER_PATTERN_FIXED_LEN OFFSETOF(wl_pkt_filter_pattern_t, mask_and_pattern) +#define WL_PKT_FILTER_FIXED_LEN offsetof(wl_pkt_filter_t, u) +#define WL_PKT_FILTER_PATTERN_FIXED_LEN offsetof(wl_pkt_filter_pattern_t, mask_and_pattern) /* IOVAR "pkt_filter_enable" parameter. */ typedef struct wl_pkt_filter_enable { @@ -1964,7 +1964,7 @@ typedef struct wl_pkt_filter_list { wl_pkt_filter_t filter[1]; /* Variable array of packet filters. */ } wl_pkt_filter_list_t; -#define WL_PKT_FILTER_LIST_FIXED_LEN OFFSETOF(wl_pkt_filter_list_t, filter) +#define WL_PKT_FILTER_LIST_FIXED_LEN offsetof(wl_pkt_filter_list_t, filter) /* IOVAR "pkt_filter_stats" parameter. Used to retrieve debug statistics. */ typedef struct wl_pkt_filter_stats { |