diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2007-12-27 01:25:40 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 18:08:45 -0500 |
commit | 8fffc15dc777ce3fe12ddc582d7c87a642591d3b (patch) | |
tree | 0ef330503f628e5618e860c63e6be1fd70f94588 /net/ieee80211/ieee80211_rx.c | |
parent | c0ddd04d55e0a4d1506b6b8a4eb9e2b62f3aa41d (diff) |
eliminate byteswapping in struct ieee80211_qos_parameters
Make it match the on-the-wire endianness, eliminate byteswapping.
The only driver that used this sucker (ipw2200) updated.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/ieee80211_rx.c')
-rw-r--r-- | net/ieee80211/ieee80211_rx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ieee80211/ieee80211_rx.c b/net/ieee80211/ieee80211_rx.c index 13b12a670194..0a18edbdfcb5 100644 --- a/net/ieee80211/ieee80211_rx.c +++ b/net/ieee80211/ieee80211_rx.c | |||
@@ -1032,16 +1032,16 @@ static int ieee80211_qos_convert_ac_to_parameters(struct | |||
1032 | qos_param->aifs[i] -= (qos_param->aifs[i] < 2) ? 0 : 2; | 1032 | qos_param->aifs[i] -= (qos_param->aifs[i] < 2) ? 0 : 2; |
1033 | 1033 | ||
1034 | cw_min = ac_params->ecw_min_max & 0x0F; | 1034 | cw_min = ac_params->ecw_min_max & 0x0F; |
1035 | qos_param->cw_min[i] = (u16) ((1 << cw_min) - 1); | 1035 | qos_param->cw_min[i] = cpu_to_le16((1 << cw_min) - 1); |
1036 | 1036 | ||
1037 | cw_max = (ac_params->ecw_min_max & 0xF0) >> 4; | 1037 | cw_max = (ac_params->ecw_min_max & 0xF0) >> 4; |
1038 | qos_param->cw_max[i] = (u16) ((1 << cw_max) - 1); | 1038 | qos_param->cw_max[i] = cpu_to_le16((1 << cw_max) - 1); |
1039 | 1039 | ||
1040 | qos_param->flag[i] = | 1040 | qos_param->flag[i] = |
1041 | (ac_params->aci_aifsn & 0x10) ? 0x01 : 0x00; | 1041 | (ac_params->aci_aifsn & 0x10) ? 0x01 : 0x00; |
1042 | 1042 | ||
1043 | txop = le16_to_cpu(ac_params->tx_op_limit) * 32; | 1043 | txop = le16_to_cpu(ac_params->tx_op_limit) * 32; |
1044 | qos_param->tx_op_limit[i] = (u16) txop; | 1044 | qos_param->tx_op_limit[i] = cpu_to_le16(txop); |
1045 | } | 1045 | } |
1046 | return rc; | 1046 | return rc; |
1047 | } | 1047 | } |