diff options
author | Moritz Muehlenhoff <jmm@debian.org> | 2009-01-21 16:00:41 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-03 17:53:16 -0400 |
commit | 28b17a4bdf148b7591c004efd10a8850d52849ec (patch) | |
tree | f5efadf76aa6850d79f475e5f16e2160450341f3 /drivers/staging/wlan-ng/hfa384x.h | |
parent | 9cba46dc1c1c98d9e1c44be7b8d435ad553f799e (diff) |
Staging: wlan-ng: Remove use of WLAN_ADDR_LEN
Replace the driver local WLAN_ADDR_LEN constant through the kernel-wide ETH_ALEN definiton.
Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/wlan-ng/hfa384x.h')
-rw-r--r-- | drivers/staging/wlan-ng/hfa384x.h | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/drivers/staging/wlan-ng/hfa384x.h b/drivers/staging/wlan-ng/hfa384x.h index f7d69e084e6..b88bfe43782 100644 --- a/drivers/staging/wlan-ng/hfa384x.h +++ b/drivers/staging/wlan-ng/hfa384x.h | |||
@@ -61,6 +61,8 @@ | |||
61 | 61 | ||
62 | #define HFA384x_LEVEL_TO_dBm(v) (0x100 + (v) * 100 / 255 - 100) | 62 | #define HFA384x_LEVEL_TO_dBm(v) (0x100 + (v) * 100 / 255 - 100) |
63 | 63 | ||
64 | #include <linux/if_ether.h> | ||
65 | |||
64 | /*------ Constants --------------------------------------------*/ | 66 | /*------ Constants --------------------------------------------*/ |
65 | /*--- Mins & Maxs -----------------------------------*/ | 67 | /*--- Mins & Maxs -----------------------------------*/ |
66 | #define HFA384x_CMD_ALLOC_LEN_MIN ((u16)4) | 68 | #define HFA384x_CMD_ALLOC_LEN_MIN ((u16)4) |
@@ -450,7 +452,7 @@ Configuration RID Lengths: Network Param, Dynamic Config Entities | |||
450 | include the len or code fields) | 452 | include the len or code fields) |
451 | --------------------------------------------------------------------*/ | 453 | --------------------------------------------------------------------*/ |
452 | /* TODO: fill in the rest of these */ | 454 | /* TODO: fill in the rest of these */ |
453 | #define HFA384x_RID_GROUPADDR_LEN ((u16)16 * WLAN_ADDR_LEN) | 455 | #define HFA384x_RID_GROUPADDR_LEN ((u16)16 * ETH_ALEN) |
454 | #define HFA384x_RID_CREATEIBSS_LEN ((u16)0) | 456 | #define HFA384x_RID_CREATEIBSS_LEN ((u16)0) |
455 | #define HFA384x_RID_FRAGTHRESH_LEN ((u16)0) | 457 | #define HFA384x_RID_FRAGTHRESH_LEN ((u16)0) |
456 | #define HFA384x_RID_RTSTHRESH_LEN ((u16)0) | 458 | #define HFA384x_RID_RTSTHRESH_LEN ((u16)0) |
@@ -1130,7 +1132,7 @@ typedef struct hfa384x_JoinRequest_data | |||
1130 | /*-- Configuration Record: authenticateStation (data portion only) --*/ | 1132 | /*-- Configuration Record: authenticateStation (data portion only) --*/ |
1131 | typedef struct hfa384x_authenticateStation_data | 1133 | typedef struct hfa384x_authenticateStation_data |
1132 | { | 1134 | { |
1133 | u8 address[WLAN_ADDR_LEN]; | 1135 | u8 address[ETH_ALEN]; |
1134 | u16 status; | 1136 | u16 status; |
1135 | u16 algorithm; | 1137 | u16 algorithm; |
1136 | } __attribute__((packed)) hfa384x_authenticateStation_data_t; | 1138 | } __attribute__((packed)) hfa384x_authenticateStation_data_t; |
@@ -1138,7 +1140,7 @@ typedef struct hfa384x_authenticateStation_data | |||
1138 | /*-- Configuration Record: associateStation (data portion only) --*/ | 1140 | /*-- Configuration Record: associateStation (data portion only) --*/ |
1139 | typedef struct hfa384x_associateStation_data | 1141 | typedef struct hfa384x_associateStation_data |
1140 | { | 1142 | { |
1141 | u8 address[WLAN_ADDR_LEN]; | 1143 | u8 address[ETH_ALEN]; |
1142 | u16 status; | 1144 | u16 status; |
1143 | u16 type; | 1145 | u16 type; |
1144 | } __attribute__((packed)) hfa384x_associateStation_data_t; | 1146 | } __attribute__((packed)) hfa384x_associateStation_data_t; |
@@ -1153,7 +1155,7 @@ typedef struct hfa384x_ChannelInfoRequest_data | |||
1153 | /*-- Configuration Record: WEPKeyMapping (data portion only) --*/ | 1155 | /*-- Configuration Record: WEPKeyMapping (data portion only) --*/ |
1154 | typedef struct hfa384x_WEPKeyMapping | 1156 | typedef struct hfa384x_WEPKeyMapping |
1155 | { | 1157 | { |
1156 | u8 address[WLAN_ADDR_LEN]; | 1158 | u8 address[ETH_ALEN]; |
1157 | u16 key_index; | 1159 | u16 key_index; |
1158 | u8 key[16]; | 1160 | u8 key[16]; |
1159 | u8 mic_transmit_key[4]; | 1161 | u8 mic_transmit_key[4]; |
@@ -1880,9 +1882,9 @@ typedef struct hfa384x_LinkStatus | |||
1880 | typedef struct hfa384x_AssocStatus | 1882 | typedef struct hfa384x_AssocStatus |
1881 | { | 1883 | { |
1882 | u16 assocstatus; | 1884 | u16 assocstatus; |
1883 | u8 sta_addr[WLAN_ADDR_LEN]; | 1885 | u8 sta_addr[ETH_ALEN]; |
1884 | /* old_ap_addr is only valid if assocstatus == 2 */ | 1886 | /* old_ap_addr is only valid if assocstatus == 2 */ |
1885 | u8 old_ap_addr[WLAN_ADDR_LEN]; | 1887 | u8 old_ap_addr[ETH_ALEN]; |
1886 | u16 reason; | 1888 | u16 reason; |
1887 | u16 reserved; | 1889 | u16 reserved; |
1888 | } __attribute__((packed)) hfa384x_AssocStatus_t; | 1890 | } __attribute__((packed)) hfa384x_AssocStatus_t; |
@@ -1891,7 +1893,7 @@ typedef struct hfa384x_AssocStatus | |||
1891 | 1893 | ||
1892 | typedef struct hfa384x_AuthRequest | 1894 | typedef struct hfa384x_AuthRequest |
1893 | { | 1895 | { |
1894 | u8 sta_addr[WLAN_ADDR_LEN]; | 1896 | u8 sta_addr[ETH_ALEN]; |
1895 | u16 algorithm; | 1897 | u16 algorithm; |
1896 | } __attribute__((packed)) hfa384x_AuthReq_t; | 1898 | } __attribute__((packed)) hfa384x_AuthReq_t; |
1897 | 1899 | ||
@@ -1899,7 +1901,7 @@ typedef struct hfa384x_AuthRequest | |||
1899 | 1901 | ||
1900 | typedef struct hfa384x_AssocRequest | 1902 | typedef struct hfa384x_AssocRequest |
1901 | { | 1903 | { |
1902 | u8 sta_addr[WLAN_ADDR_LEN]; | 1904 | u8 sta_addr[ETH_ALEN]; |
1903 | u16 type; | 1905 | u16 type; |
1904 | u8 wpa_data[80]; | 1906 | u8 wpa_data[80]; |
1905 | } __attribute__((packed)) hfa384x_AssocReq_t; | 1907 | } __attribute__((packed)) hfa384x_AssocReq_t; |
@@ -1912,8 +1914,8 @@ typedef struct hfa384x_AssocRequest | |||
1912 | 1914 | ||
1913 | typedef struct hfa384x_MicFailure | 1915 | typedef struct hfa384x_MicFailure |
1914 | { | 1916 | { |
1915 | u8 sender[WLAN_ADDR_LEN]; | 1917 | u8 sender[ETH_ALEN]; |
1916 | u8 dest[WLAN_ADDR_LEN]; | 1918 | u8 dest[ETH_ALEN]; |
1917 | } __attribute__((packed)) hfa384x_MicFailure_t; | 1919 | } __attribute__((packed)) hfa384x_MicFailure_t; |
1918 | 1920 | ||
1919 | /*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/ | 1921 | /*-- Unsolicited Frame, MAC Mgmt: PSUserCount (AP Only) --*/ |
@@ -1925,7 +1927,7 @@ typedef struct hfa384x_PSUserCount | |||
1925 | 1927 | ||
1926 | typedef struct hfa384x_KeyIDChanged | 1928 | typedef struct hfa384x_KeyIDChanged |
1927 | { | 1929 | { |
1928 | u8 sta_addr[WLAN_ADDR_LEN]; | 1930 | u8 sta_addr[ETH_ALEN]; |
1929 | u16 keyid; | 1931 | u16 keyid; |
1930 | } __attribute__((packed)) hfa384x_KeyIDChanged_t; | 1932 | } __attribute__((packed)) hfa384x_KeyIDChanged_t; |
1931 | 1933 | ||
@@ -2460,7 +2462,7 @@ typedef struct hfa484x_metacmd | |||
2460 | typedef struct prism2sta_authlist | 2462 | typedef struct prism2sta_authlist |
2461 | { | 2463 | { |
2462 | unsigned int cnt; | 2464 | unsigned int cnt; |
2463 | u8 addr[WLAN_AUTH_MAX][WLAN_ADDR_LEN]; | 2465 | u8 addr[WLAN_AUTH_MAX][ETH_ALEN]; |
2464 | u8 assoc[WLAN_AUTH_MAX]; | 2466 | u8 assoc[WLAN_AUTH_MAX]; |
2465 | } prism2sta_authlist_t; | 2467 | } prism2sta_authlist_t; |
2466 | 2468 | ||
@@ -2468,9 +2470,9 @@ typedef struct prism2sta_accesslist | |||
2468 | { | 2470 | { |
2469 | unsigned int modify; | 2471 | unsigned int modify; |
2470 | unsigned int cnt; | 2472 | unsigned int cnt; |
2471 | u8 addr[WLAN_ACCESS_MAX][WLAN_ADDR_LEN]; | 2473 | u8 addr[WLAN_ACCESS_MAX][ETH_ALEN]; |
2472 | unsigned int cnt1; | 2474 | unsigned int cnt1; |
2473 | u8 addr1[WLAN_ACCESS_MAX][WLAN_ADDR_LEN]; | 2475 | u8 addr1[WLAN_ACCESS_MAX][ETH_ALEN]; |
2474 | } prism2sta_accesslist_t; | 2476 | } prism2sta_accesslist_t; |
2475 | 2477 | ||
2476 | typedef struct hfa384x | 2478 | typedef struct hfa384x |
@@ -2552,7 +2554,7 @@ typedef struct hfa384x | |||
2552 | 2554 | ||
2553 | /* Group Addresses - right now, there are up to a total | 2555 | /* Group Addresses - right now, there are up to a total |
2554 | of MAX_GRP_ADDR group addresses */ | 2556 | of MAX_GRP_ADDR group addresses */ |
2555 | u8 dot11_grp_addr[MAX_GRP_ADDR][WLAN_ADDR_LEN]; | 2557 | u8 dot11_grp_addr[MAX_GRP_ADDR][ETH_ALEN]; |
2556 | unsigned int dot11_grpcnt; | 2558 | unsigned int dot11_grpcnt; |
2557 | 2559 | ||
2558 | /* Component Identities */ | 2560 | /* Component Identities */ |