Commit 78a9bc73 authored by Jannik Becher's avatar Jannik Becher Committed by Greg Kroah-Hartman

staging: rtl8712: changed u32 to __le32

Fixed sparse warnings.
Deleted cpu_to_le32() for enum. I'm not sure why it was there.
Signed-off-by: default avatarJannik Becher <becher.jannik@gmail.com>
Tested-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 502c8074
...@@ -66,7 +66,7 @@ struct joinbss_event { ...@@ -66,7 +66,7 @@ struct joinbss_event {
struct stassoc_event { struct stassoc_event {
unsigned char macaddr[6]; unsigned char macaddr[6];
unsigned char rsvd[2]; unsigned char rsvd[2];
int cam_id; __le32 cam_id;
}; };
struct stadel_event { struct stadel_event {
......
...@@ -257,10 +257,10 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork) ...@@ -257,10 +257,10 @@ int r8712_is_same_ibss(struct _adapter *adapter, struct wlan_network *pnetwork)
struct security_priv *psecuritypriv = &adapter->securitypriv; struct security_priv *psecuritypriv = &adapter->securitypriv;
if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) && if ((psecuritypriv->PrivacyAlgrthm != _NO_PRIVACY_) &&
(pnetwork->network.Privacy == 0)) (pnetwork->network.Privacy == cpu_to_le32(0)))
ret = false; ret = false;
else if ((psecuritypriv->PrivacyAlgrthm == _NO_PRIVACY_) && else if ((psecuritypriv->PrivacyAlgrthm == _NO_PRIVACY_) &&
(pnetwork->network.Privacy == 1)) (pnetwork->network.Privacy == cpu_to_le32(1)))
ret = false; ret = false;
else else
ret = true; ret = true;
...@@ -933,7 +933,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf) ...@@ -933,7 +933,7 @@ void r8712_stassoc_event_callback(struct _adapter *adapter, u8 *pbuf)
return; return;
/* to do : init sta_info variable */ /* to do : init sta_info variable */
psta->qos_option = 0; psta->qos_option = 0;
psta->mac_id = le32_to_cpu((uint)pstassoc->cam_id); psta->mac_id = le32_to_cpu(pstassoc->cam_id);
/* psta->aid = (uint)pstassoc->cam_id; */ /* psta->aid = (uint)pstassoc->cam_id; */
if (adapter->securitypriv.AuthAlgrthm == 2) if (adapter->securitypriv.AuthAlgrthm == 2)
...@@ -1637,14 +1637,14 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter) ...@@ -1637,14 +1637,14 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
pdev_network->Rssi = 0; pdev_network->Rssi = 0;
switch (pregistrypriv->wireless_mode) { switch (pregistrypriv->wireless_mode) {
case WIRELESS_11B: case WIRELESS_11B:
pdev_network->NetworkTypeInUse = cpu_to_le32(Ndis802_11DS); pdev_network->NetworkTypeInUse = Ndis802_11DS;
break; break;
case WIRELESS_11G: case WIRELESS_11G:
case WIRELESS_11BG: case WIRELESS_11BG:
pdev_network->NetworkTypeInUse = cpu_to_le32(Ndis802_11OFDM24); pdev_network->NetworkTypeInUse = Ndis802_11OFDM24;
break; break;
case WIRELESS_11A: case WIRELESS_11A:
pdev_network->NetworkTypeInUse = cpu_to_le32(Ndis802_11OFDM5); pdev_network->NetworkTypeInUse = Ndis802_11OFDM5;
break; break;
default: default:
/* TODO */ /* TODO */
...@@ -1654,8 +1654,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter) ...@@ -1654,8 +1654,7 @@ void r8712_update_registrypriv_dev_network(struct _adapter *adapter)
pregistrypriv->channel); pregistrypriv->channel);
if (cur_network->network.InfrastructureMode == Ndis802_11IBSS) if (cur_network->network.InfrastructureMode == Ndis802_11IBSS)
pdev_network->Configuration.ATIMWindow = cpu_to_le32(3); pdev_network->Configuration.ATIMWindow = cpu_to_le32(3);
pdev_network->InfrastructureMode = cpu_to_le32( pdev_network->InfrastructureMode = cur_network->network.InfrastructureMode;
cur_network->network.InfrastructureMode);
/* 1. Supported rates /* 1. Supported rates
* 2. IE * 2. IE
*/ */
......
...@@ -83,7 +83,7 @@ struct wlan_bssid_ex { ...@@ -83,7 +83,7 @@ struct wlan_bssid_ex {
unsigned char MacAddress[6]; unsigned char MacAddress[6];
u8 Reserved[2]; u8 Reserved[2];
struct ndis_802_11_ssid Ssid; struct ndis_802_11_ssid Ssid;
u32 Privacy; __le32 Privacy;
s32 Rssi; s32 Rssi;
enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; enum NDIS_802_11_NETWORK_TYPE NetworkTypeInUse;
struct NDIS_802_11_CONFIGURATION Configuration; struct NDIS_802_11_CONFIGURATION Configuration;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment