mirror of
https://github.com/aircrack-ng/rtl8812au.git
synced 2025-01-03 21:04:05 +00:00
Use endian macros from kernel + spacing
This commit is contained in:
Christian kimocoder
GitHub
parent
4615068c76
commit
efc08fe295
@ -33,7 +33,6 @@
|
||||
extern int rtw_ht_enable;
|
||||
#endif
|
||||
|
||||
|
||||
#define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV+30)
|
||||
|
||||
#define SCAN_ITEM_SIZE 768
|
||||
@ -57,7 +56,6 @@ extern int ui_pid[3];
|
||||
#define WEXT_CSCAN_HOME_DWELL_SECTION 'H'
|
||||
#define WEXT_CSCAN_TYPE_SECTION 'T'
|
||||
|
||||
|
||||
extern u8 key_2char2num(u8 hch, u8 lch);
|
||||
extern u8 str_2char2num(u8 hch, u8 lch);
|
||||
extern void macstr2num(u8 *dst, u8 *src);
|
||||
@ -148,7 +146,6 @@ static void indicate_wx_custom_event(_adapter *padapter, char *msg)
|
||||
|
||||
}
|
||||
|
||||
|
||||
static void request_wps_pbc_event(_adapter *padapter)
|
||||
{
|
||||
u8 *buff, *p;
|
||||
@ -219,7 +216,6 @@ void indicate_wx_scan_complete_event(_adapter *padapter)
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
void rtw_indicate_wx_assoc_event(_adapter *padapter)
|
||||
{
|
||||
union iwreq_data wrqu;
|
||||
@ -586,7 +582,6 @@ static inline char *iwe_stream_wpa_wpa2_process(_adapter *padapter,
|
||||
u8 *p;
|
||||
sint out_len = 0;
|
||||
|
||||
|
||||
if (pbuf) {
|
||||
p = pbuf;
|
||||
|
||||
@ -694,7 +689,6 @@ static inline char *iwe_stream_wapi_process(_adapter *padapter,
|
||||
RTW_INFO("rtw_wx_get_scan: %s ", pnetwork->network.Ssid.Ssid);
|
||||
RTW_INFO("rtw_wx_get_scan: ssid = %d ", wapi_len);
|
||||
|
||||
|
||||
if (wapi_len > 0) {
|
||||
p = buf_wapi;
|
||||
/* _rtw_memset(buf_wapi, 0, MAX_WAPI_IE_LEN*2); */
|
||||
@ -746,7 +740,6 @@ static inline char *iwe_stream_rssi_process(_adapter *padapter,
|
||||
sq = pnetwork->network.PhyInfo.SignalQuality;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
|
||||
iwe->u.qual.level = (u8) translate_percentage_to_dbm(ss); /* dbm */
|
||||
#else
|
||||
@ -1103,7 +1096,6 @@ static char *translate_scan(_adapter *padapter,
|
||||
RTW_INFO("rtw_wx_get_scan: %s ", pnetwork->network.Ssid.Ssid);
|
||||
RTW_INFO("rtw_wx_get_scan: ssid = %d ", wapi_len);
|
||||
|
||||
|
||||
if (wapi_len > 0) {
|
||||
p = buf_wapi;
|
||||
_rtw_memset(buf_wapi, 0, MAX_WAPI_IE_LEN * 2);
|
||||
@ -1150,7 +1142,6 @@ static char *translate_scan(_adapter *padapter,
|
||||
sq = pnetwork->network.PhyInfo.SignalQuality;
|
||||
}
|
||||
|
||||
|
||||
#ifdef CONFIG_SIGNAL_DISPLAY_DBM
|
||||
iwe.u.qual.level = (u8) translate_percentage_to_dbm(ss); /* dbm */
|
||||
#else
|
||||
@ -1262,7 +1253,6 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
|
||||
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
|
||||
param->u.crypt.err = 0;
|
||||
param->u.crypt.alg[IEEE_CRYPT_ALG_NAME_LEN - 1] = '\0';
|
||||
|
||||
@ -1484,7 +1474,6 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -1645,7 +1634,6 @@ static int rtw_set_wpa_ie(_adapter *padapter, char *pie, unsigned short ielen)
|
||||
* || check_fwstate(&padapter->mlmepriv, WIFI_UNDER_WPS) == _TRUE) */
|
||||
rtw_hal_set_hwreg(padapter, HW_VAR_OFF_RCR_AM, null_addr);
|
||||
|
||||
|
||||
exit:
|
||||
|
||||
if (buf)
|
||||
@ -1667,8 +1655,6 @@ static int rtw_wx_get_name(struct net_device *dev,
|
||||
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
|
||||
NDIS_802_11_RATES_EX *prates = NULL;
|
||||
|
||||
|
||||
|
||||
if (check_fwstate(pmlmepriv, _FW_LINKED | WIFI_ADHOC_MASTER_STATE) == _TRUE) {
|
||||
/* parsing HT_CAP_IE */
|
||||
p = rtw_get_ie(&pcur_bss->IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pcur_bss->IELength - 12);
|
||||
@ -1718,7 +1704,6 @@ static int rtw_wx_get_name(struct net_device *dev,
|
||||
snprintf(wrqu->name, IFNAMSIZ, "unassociated");
|
||||
}
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1733,8 +1718,6 @@ static int rtw_wx_set_freq(struct net_device *dev,
|
||||
struct wlan_network *cur_network = &(pmlmepriv->cur_network);
|
||||
int exp = 1, freq = 0, div = 0;
|
||||
|
||||
|
||||
|
||||
if (wrqu->freq.m <= 1000) {
|
||||
if (wrqu->freq.flags == IW_FREQ_AUTO) {
|
||||
if (rtw_ch_set_search_ch(padapter->mlmeextpriv.channel_set, wrqu->freq.m) > 0) {
|
||||
@ -1778,7 +1761,6 @@ static int rtw_wx_set_freq(struct net_device *dev,
|
||||
|
||||
set_channel_bwmode(padapter, padapter->mlmeextpriv.cur_channel, HAL_PRIME_CHNL_OFFSET_DONT_CARE, CHANNEL_WIDTH_20);
|
||||
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -1891,7 +1873,6 @@ static int rtw_wx_set_mode(struct net_device *dev, struct iw_request_info *a,
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
@ -1902,8 +1883,6 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
|
||||
|
||||
|
||||
if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) == _TRUE)
|
||||
wrqu->mode = IW_MODE_INFRA;
|
||||
else if ((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE) ||
|
||||
@ -1922,7 +1901,6 @@ static int rtw_wx_get_mode(struct net_device *dev, struct iw_request_info *a,
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int rtw_wx_set_pmkid(struct net_device *dev,
|
||||
struct iw_request_info *a,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
@ -2043,8 +2021,6 @@ static int rtw_wx_get_range(struct net_device *dev,
|
||||
u16 val;
|
||||
int i;
|
||||
|
||||
|
||||
|
||||
wrqu->data.length = sizeof(*range);
|
||||
_rtw_memset(range, 0, sizeof(*range));
|
||||
|
||||
@ -2182,8 +2158,6 @@ static int rtw_wx_get_range(struct net_device *dev,
|
||||
IW_SCAN_CAPA_CHANNEL | IW_SCAN_CAPA_MODE | IW_SCAN_CAPA_RATE;
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
@ -2318,8 +2292,6 @@ static int rtw_wx_get_wap(struct net_device *dev,
|
||||
|
||||
_rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
|
||||
|
||||
|
||||
|
||||
if (((check_fwstate(pmlmepriv, _FW_LINKED)) == _TRUE) ||
|
||||
((check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE)) == _TRUE) ||
|
||||
((check_fwstate(pmlmepriv, WIFI_AP_STATE)) == _TRUE))
|
||||
@ -2328,7 +2300,6 @@ static int rtw_wx_get_wap(struct net_device *dev,
|
||||
else
|
||||
_rtw_memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
|
||||
|
||||
|
||||
return 0;
|
||||
|
||||
}
|
||||
@ -2351,7 +2322,6 @@ static int rtw_wx_set_mlme(struct net_device *dev,
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
|
||||
struct iw_mlme *mlme = (struct iw_mlme *) extra;
|
||||
|
||||
|
||||
if (mlme == NULL)
|
||||
return -1;
|
||||
|
||||
@ -2359,10 +2329,8 @@ static int rtw_wx_set_mlme(struct net_device *dev,
|
||||
|
||||
reason = cpu_to_le16(mlme->reason_code);
|
||||
|
||||
|
||||
RTW_INFO("%s, cmd=%d, reason=%d\n", __FUNCTION__, mlme->cmd, reason);
|
||||
|
||||
|
||||
switch (mlme->cmd) {
|
||||
case IW_MLME_DEAUTH:
|
||||
if (!rtw_set_802_11_disassociate(padapter))
|
||||
@ -2395,7 +2363,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
|
||||
struct wifidirect_info *pwdinfo = &(padapter->wdinfo);
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
|
||||
#ifdef DBG_IOCTL
|
||||
RTW_INFO("DBG_IOCTL %s:%d\n", __FUNCTION__, __LINE__);
|
||||
#endif
|
||||
@ -2522,7 +2489,6 @@ static int rtw_wx_set_scan(struct net_device *dev, struct iw_request_info *a,
|
||||
len -= sec_len;
|
||||
break;
|
||||
|
||||
|
||||
case WEXT_CSCAN_CHANNEL_SECTION:
|
||||
/* RTW_INFO("WEXT_CSCAN_CHANNEL_SECTION\n"); */
|
||||
pos += 1;
|
||||
@ -2603,7 +2569,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
|
||||
struct wifidirect_info *pwdinfo = &padapter->wdinfo;
|
||||
#endif /* CONFIG_P2P */
|
||||
|
||||
|
||||
#ifdef DBG_IOCTL
|
||||
RTW_INFO("DBG_IOCTL %s:%d\n", __FUNCTION__, __LINE__);
|
||||
#endif
|
||||
@ -2683,7 +2648,6 @@ static int rtw_wx_get_scan(struct net_device *dev, struct iw_request_info *a,
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
#ifdef DBG_IOCTL
|
||||
RTW_INFO("DBG_IOCTL %s:%d return %d\n", __FUNCTION__, __LINE__, ret);
|
||||
#endif
|
||||
@ -2732,8 +2696,6 @@ static int rtw_wx_set_essid(struct net_device *dev,
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
||||
|
||||
rtw_ps_deny(padapter, PS_DENY_JOIN);
|
||||
if (_FAIL == rtw_pwr_wakeup(padapter)) {
|
||||
ret = -1;
|
||||
@ -2845,7 +2807,6 @@ exit:
|
||||
RTW_INFO("DBG_IOCTL %s:%d return %d\n", __FUNCTION__, __LINE__, ret);
|
||||
#endif
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -2858,8 +2819,6 @@ static int rtw_wx_get_essid(struct net_device *dev,
|
||||
struct mlme_priv *pmlmepriv = &(padapter->mlmepriv);
|
||||
WLAN_BSSID_EX *pcur_bss = &pmlmepriv->cur_network.network;
|
||||
|
||||
|
||||
|
||||
if ((check_fwstate(pmlmepriv, _FW_LINKED) == _TRUE) ||
|
||||
(check_fwstate(pmlmepriv, WIFI_ADHOC_MASTER_STATE) == _TRUE)) {
|
||||
len = pcur_bss->Ssid.SsidLength;
|
||||
@ -2876,7 +2835,6 @@ static int rtw_wx_get_essid(struct net_device *dev,
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
@ -2893,8 +2851,6 @@ static int rtw_wx_set_rate(struct net_device *dev,
|
||||
u32 ratevalue = 0;
|
||||
u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff};
|
||||
|
||||
|
||||
|
||||
if (target_rate == -1) {
|
||||
ratevalue = 11;
|
||||
goto set_rate;
|
||||
@ -2959,7 +2915,6 @@ set_rate:
|
||||
ret = -1;
|
||||
}
|
||||
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
@ -3051,7 +3006,6 @@ static int rtw_wx_get_frag(struct net_device *dev,
|
||||
{
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
|
||||
|
||||
|
||||
RTW_INFO("%s, frag_len=%d\n", __func__, padapter->xmitpriv.frag_len);
|
||||
|
||||
wrqu->frag.value = padapter->xmitpriv.frag_len;
|
||||
@ -3068,7 +3022,6 @@ static int rtw_wx_get_retry(struct net_device *dev,
|
||||
{
|
||||
/* _adapter *padapter = (_adapter *)rtw_netdev_priv(dev); */
|
||||
|
||||
|
||||
wrqu->retry.value = 7;
|
||||
wrqu->retry.fixed = 0; /* no auto select */
|
||||
wrqu->retry.disabled = 1;
|
||||
@ -3118,7 +3071,6 @@ static int rtw_wx_set_enc(struct net_device *dev,
|
||||
|
||||
key = erq->flags & IW_ENCODE_INDEX;
|
||||
|
||||
|
||||
if (erq->flags & IW_ENCODE_DISABLED) {
|
||||
RTW_INFO("EncryptionDisabled\n");
|
||||
padapter->securitypriv.ndisencryptstatus = Ndis802_11EncryptionDisabled;
|
||||
@ -3225,7 +3177,6 @@ static int rtw_wx_set_enc(struct net_device *dev,
|
||||
|
||||
exit:
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
@ -3248,7 +3199,6 @@ static int rtw_wx_get_enc(struct net_device *dev,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
key = erq->flags & IW_ENCODE_INDEX;
|
||||
|
||||
if (key) {
|
||||
@ -3310,7 +3260,6 @@ static int rtw_wx_get_enc(struct net_device *dev,
|
||||
|
||||
}
|
||||
|
||||
|
||||
return ret;
|
||||
|
||||
}
|
||||
@ -3448,7 +3397,6 @@ static int rtw_wx_set_auth(struct net_device *dev,
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
ret = wpa_set_auth_algs(dev, (u32)param->value);
|
||||
|
||||
break;
|
||||
@ -3509,7 +3457,6 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
|
||||
param->cmd = IEEE_CMD_SET_ENCRYPTION;
|
||||
_rtw_memset(param->sta_addr, 0xff, ETH_ALEN);
|
||||
|
||||
|
||||
switch (pext->alg) {
|
||||
case IW_ENCODE_ALG_NONE:
|
||||
/* todo: remove key */
|
||||
@ -3593,7 +3540,6 @@ exit:
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
static int rtw_wx_get_nick(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
@ -3636,7 +3582,6 @@ static int rtw_wx_get_nick(struct net_device *dev,
|
||||
|
||||
RTW_INFO("dbg(0x664)=0x%x\n", rtw_read32(padapter, 0x664));
|
||||
|
||||
|
||||
RTW_INFO("\n");
|
||||
|
||||
RTW_INFO("dbg(0x430)=0x%x\n", rtw_read32(padapter, 0x430));
|
||||
@ -3672,7 +3617,6 @@ static int rtw_wx_read32(struct net_device *dev,
|
||||
u8 *ptmp;
|
||||
int ret;
|
||||
|
||||
|
||||
ret = 0;
|
||||
padapter = (PADAPTER)rtw_netdev_priv(dev);
|
||||
p = &wrqu->data;
|
||||
@ -3778,7 +3722,6 @@ static int rtw_wx_read_rf(struct net_device *dev,
|
||||
_adapter *padapter = (_adapter *)rtw_netdev_priv(dev);
|
||||
u32 path, addr, data32;
|
||||
|
||||
|
||||
path = *(u32 *)extra;
|
||||
addr = *((u32 *)extra + 1);
|
||||
data32 = rtw_hal_read_rfreg(padapter, path, addr, 0xFFFFF);
|
||||
@ -3917,7 +3860,6 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
|
||||
goto _rtw_drvext_hdl_exit;
|
||||
}
|
||||
|
||||
|
||||
bset = (u8)(p->flags & 0xFFFF);
|
||||
len = p->length;
|
||||
pparmbuf = (u8 *)rtw_malloc(len);
|
||||
@ -3936,25 +3878,20 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* */
|
||||
poidparam = (struct drvext_oidparam *)pparmbuf;
|
||||
|
||||
|
||||
|
||||
/* check subcode */
|
||||
if (poidparam->subcode >= MAX_DRVEXT_HANDLERS) {
|
||||
ret = -EINVAL;
|
||||
goto _rtw_drvext_hdl_exit;
|
||||
}
|
||||
|
||||
|
||||
if (poidparam->subcode >= MAX_DRVEXT_OID_SUBCODES) {
|
||||
ret = -EINVAL;
|
||||
goto _rtw_drvext_hdl_exit;
|
||||
}
|
||||
|
||||
|
||||
phandler = drvextoidhandlers + poidparam->subcode;
|
||||
|
||||
if (poidparam->len != phandler->parmsize) {
|
||||
@ -3962,7 +3899,6 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
|
||||
goto _rtw_drvext_hdl_exit;
|
||||
}
|
||||
|
||||
|
||||
res = phandler->handler(&padapter->drvextpriv, bset, poidparam->data);
|
||||
|
||||
if (res == 0) {
|
||||
@ -3976,7 +3912,6 @@ static int rtw_drvext_hdl(struct net_device *dev, struct iw_request_info *info,
|
||||
} else
|
||||
ret = -EFAULT;
|
||||
|
||||
|
||||
_rtw_drvext_hdl_exit:
|
||||
|
||||
return ret;
|
||||
@ -4224,7 +4159,6 @@ static int rtw_get_ap_info(struct net_device *dev,
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
/* pdata->length = 0; */ /* ? */
|
||||
pdata->flags = 0;
|
||||
if (pdata->length >= 32) {
|
||||
@ -4246,7 +4180,6 @@ static int rtw_get_ap_info(struct net_device *dev,
|
||||
if (rtw_end_of_queue_search(phead, plist) == _TRUE)
|
||||
break;
|
||||
|
||||
|
||||
pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list);
|
||||
|
||||
/* if(hwaddr_aton_i(pdata->pointer, bssid)) */
|
||||
@ -4256,7 +4189,6 @@ static int rtw_get_ap_info(struct net_device *dev,
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
|
||||
if (_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == _TRUE) { /* BSSID match, then check if supporting wpa/wpa2 */
|
||||
RTW_INFO("BSSID:" MAC_FMT "\n", MAC_ARG(bssid));
|
||||
|
||||
@ -4450,7 +4382,6 @@ static int rtw_p2p_set_go_nego_ssid(struct net_device *dev,
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int rtw_p2p_set_intent(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
@ -4526,7 +4457,6 @@ static int rtw_p2p_set_op_ch(struct net_device *dev,
|
||||
|
||||
}
|
||||
|
||||
|
||||
static int rtw_p2p_profilefound(struct net_device *dev,
|
||||
struct iw_request_info *info,
|
||||
union iwreq_data *wrqu, char *extra)
|
||||
@ -11938,7 +11868,6 @@ static void freeloopbackpkt(PADAPTER padapter, struct xmit_frame *pframe)
|
||||
struct xmit_priv *pxmitpriv;
|
||||
struct xmit_buf *pxmitbuf;
|
||||
|
||||
|
||||
pxmitpriv = &padapter->xmitpriv;
|
||||
pxmitbuf = pframe->pxmitbuf;
|
||||
|
||||
@ -11950,7 +11879,6 @@ static void printdata(u8 *pbuf, u32 len)
|
||||
{
|
||||
u32 i, val;
|
||||
|
||||
|
||||
for (i = 0; (i + 4) <= len; i += 4) {
|
||||
printk("%08X", *(u32 *)(pbuf + i));
|
||||
if ((i + 4) & 0x1F)
|
||||
@ -11960,10 +11888,10 @@ static void printdata(u8 *pbuf, u32 len)
|
||||
}
|
||||
|
||||
if (i < len) {
|
||||
#ifdef CONFIG_BIG_ENDIAN
|
||||
#ifdef __BIG_ENDIAN
|
||||
for (; i < len, i++)
|
||||
printk("%02X", pbuf + i);
|
||||
#else /* CONFIG_LITTLE_ENDIAN */
|
||||
#else /* __LITTLE_ENDIAN */
|
||||
#if 0
|
||||
val = 0;
|
||||
_rtw_memcpy(&val, pbuf + i, len - i);
|
||||
@ -11978,7 +11906,7 @@ static void printdata(u8 *pbuf, u32 len)
|
||||
n = (4 - n) * 2;
|
||||
printk("%8s", str + n);
|
||||
#endif
|
||||
#endif /* CONFIG_LITTLE_ENDIAN */
|
||||
#endif /* __LITTLE_ENDIAN */
|
||||
}
|
||||
printk("\n");
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user