skyfall/rtl8188eu
1
0
Fork 0
mirror of https://github.com/lwfinger/rtl8188eu.git synced 2024-11-10 15:39:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rtl8188eu: More Sparse fixes

Browse source 
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2014-12-19 13:49:35 -06:00
parent bb33327257
commit c8e5247e2e
4 changed files with 44 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
include/linux/wireless.h
View file

@ -41,8 +41,7 @@
* For all data larger than 16 octets, we need to use a * For all data larger than 16 octets, we need to use a
* pointer to memory allocated in user space. * pointer to memory allocated in user space.
*/ */
struct iw_point struct iw_point {
{
void __user *pointer; /* Pointer to the data (in user space) */ void __user *pointer; /* Pointer to the data (in user space) */
__u16 length; /* number of fields or size in bytes */ __u16 length; /* number of fields or size in bytes */
__u16 flags; /* Optional params */ __u16 flags; /* Optional params */
@ -60,8 +59,7 @@ struct iw_point
* You should check this when increasing the structures defined * You should check this when increasing the structures defined
* above in this file... * above in this file...
*/ */
union iwreq_data union iwreq_data {
{
/* Config - generic */ /* Config - generic */
char name[IFNAMSIZ]; char name[IFNAMSIZ];
/* Name : used to verify the presence of wireless extensions. /* Name : used to verify the presence of wireless extensions.
@ -76,10 +74,8 @@ union iwreq_data
* convenience... * convenience...
* Do I need to remind you about structure size (32 octets) ? * Do I need to remind you about structure size (32 octets) ?
*/ */
struct iwreq struct iwreq {
{ union {
union
{
char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */ char ifrn_name[IFNAMSIZ]; /* if name, e.g. "eth0" */
} ifr_ifrn; } ifr_ifrn;

3
include/mlme_osdep.h
View file

@ -35,5 +35,8 @@ void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted);
extern void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie); extern void rtw_report_sec_ie(struct adapter *adapter,u8 authmode,u8 *sec_ie);
void rtw_reset_securitypriv( struct adapter *adapter ); void rtw_reset_securitypriv( struct adapter *adapter );
void rtw_indicate_wx_assoc_event(struct adapter *padapter);
void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
void indicate_wx_scan_complete_event(struct adapter *padapter);
#endif //_MLME_OSDEP_H_ #endif //_MLME_OSDEP_H_

149
os_dep/ioctl_linux.c
View file

@ -30,6 +30,7 @@
#include <rtw_ioctl.h> #include <rtw_ioctl.h>
#include <rtw_ioctl_set.h> #include <rtw_ioctl_set.h>
#include <rtw_ioctl_query.h> #include <rtw_ioctl_query.h>
#include <mlme_osdep.h>
#include <rtw_mp_ioctl.h> #include <rtw_mp_ioctl.h>
@ -408,43 +409,34 @@ static char *translate_scan(struct adapter *padapter,
//parsing HT_CAP_IE //parsing HT_CAP_IE
p = rtw_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12); p = rtw_get_ie(&pnetwork->network.IEs[12], _HT_CAPABILITY_IE_, &ht_ielen, pnetwork->network.IELength-12);
if(p && ht_ielen>0) if(p && ht_ielen>0) {
{
struct rtw_ieee80211_ht_cap *pht_capie; struct rtw_ieee80211_ht_cap *pht_capie;
ht_cap = _TRUE; ht_cap = _TRUE;
pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2); pht_capie = (struct rtw_ieee80211_ht_cap *)(p+2);
_rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); _rtw_memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2);
bw_40MHz = (pht_capie->cap_info&IEEE80211_HT_CAP_SUP_WIDTH) ? 1:0; bw_40MHz = (le16_to_cpu(pht_capie->cap_info) & IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0;
short_GI = (pht_capie->cap_info&(IEEE80211_HT_CAP_SGI_20|IEEE80211_HT_CAP_SGI_40)) ? 1:0; short_GI = (le16_to_cpu(pht_capie->cap_info) & (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) ? 1 : 0;
} }
/* Add the protocol name */ /* Add the protocol name */
iwe.cmd = SIOCGIWNAME; iwe.cmd = SIOCGIWNAME;
if ((rtw_is_cckratesonly_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) if ((rtw_is_cckratesonly_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) {
{
if(ht_cap == _TRUE) if(ht_cap == _TRUE)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11b");
} } else if ((rtw_is_cckrates_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE) {
else if ((rtw_is_cckrates_included((u8*)&pnetwork->network.SupportedRates)) == _TRUE)
{
if(ht_cap == _TRUE) if(ht_cap == _TRUE)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bgn");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11bg");
} } else {
else if(pnetwork->network.Configuration.DSConfig > 14) {
{
if(pnetwork->network.Configuration.DSConfig > 14)
{
if(ht_cap == _TRUE) if(ht_cap == _TRUE)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11an");
else else
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11a");
} } else {
else
{
if(ht_cap == _TRUE) if(ht_cap == _TRUE)
snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn"); snprintf(iwe.u.name, IFNAMSIZ, "IEEE 802.11gn");
else else
@ -493,8 +485,7 @@ static char *translate_scan(struct adapter *padapter,
max_rate = 0; max_rate = 0;
p = custom; p = custom;
p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): "); p += snprintf(p, MAX_CUSTOM_LEN - (p - custom), " Rates (Mb/s): ");
while(pnetwork->network.SupportedRates[i]!=0) while(pnetwork->network.SupportedRates[i]!=0) {
{
rate = pnetwork->network.SupportedRates[i]&0x7F; rate = pnetwork->network.SupportedRates[i]&0x7F;
if (rate > max_rate) if (rate > max_rate)
max_rate = rate; max_rate = rate;
@ -503,19 +494,13 @@ static char *translate_scan(struct adapter *padapter,
i++; i++;
} }
if(ht_cap == _TRUE) if(ht_cap == _TRUE) {
{ if(mcs_rate&0x8000) { //MCS15
if(mcs_rate&0x8000)//MCS15
{
max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130); max_rate = (bw_40MHz) ? ((short_GI)?300:270):((short_GI)?144:130);
} } else if(mcs_rate&0x0080) { //MCS7
else if(mcs_rate&0x0080)//MCS7
{
max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65); max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65);
} } else { //default MCS7
else//default MCS7
{
//DBG_871X("wx_get_scan, mcs_rate_bitmap=0x%x\n", mcs_rate); //DBG_871X("wx_get_scan, mcs_rate_bitmap=0x%x\n", mcs_rate);
max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65); max_rate = (bw_40MHz) ? ((short_GI)?150:135):((short_GI)?72:65);
} }
@ -4042,10 +4027,8 @@ static int rtw_get_ap_info(struct net_device *dev,
_exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL); _exit_critical_bh(&(pmlmepriv->scanned_queue.lock), &irqL);
if(pdata->length>=34) if(pdata->length>=34) {
{ if(copy_to_user((u8 __user *)pdata->pointer+32, (u8*)&pdata->flags, 1)) {
if(copy_to_user((u8*)pdata->pointer+32, (u8*)&pdata->flags, 1))
{
ret= -EINVAL; ret= -EINVAL;
goto exit; goto exit;
} }
@ -6349,55 +6332,33 @@ static int rtw_p2p_get(struct net_device *dev,
struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv; struct mlme_ext_priv *pmlmeext = &padapter->mlmeextpriv;
if ( padapter->bShowGetP2PState ) if ( padapter->bShowGetP2PState )
{
DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char *)wrqu->data.pointer ); DBG_871X( "[%s] extra = %s\n", __FUNCTION__, (char *)wrqu->data.pointer );
}
if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) if ( _rtw_memcmp( wrqu->data.pointer, "status", 6 ) ) {
{
rtw_p2p_get_status( dev, info, wrqu, extra ); rtw_p2p_get_status( dev, info, wrqu, extra );
} } else if ( _rtw_memcmp( wrqu->data.pointer, "role", 4 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "role", 4 ) )
{
rtw_p2p_get_role( dev, info, wrqu, extra); rtw_p2p_get_role( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "peer_ifa", 8 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "peer_ifa", 8 ) )
{
rtw_p2p_get_peer_ifaddr( dev, info, wrqu, extra); rtw_p2p_get_peer_ifaddr( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "req_cm", 6 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "req_cm", 6 ) )
{
rtw_p2p_get_req_cm( dev, info, wrqu, extra); rtw_p2p_get_req_cm( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "peer_deva", 9 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "peer_deva", 9 ) )
{
// Get the P2P device address when receiving the provision discovery request frame. // Get the P2P device address when receiving the provision discovery request frame.
rtw_p2p_get_peer_devaddr( dev, info, wrqu, extra); rtw_p2p_get_peer_devaddr( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "group_id", 8 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "group_id", 8 ) )
{
rtw_p2p_get_groupid( dev, info, wrqu, extra); rtw_p2p_get_groupid( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "inv_peer_deva", 13 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "inv_peer_deva", 13 ) )
{
// Get the P2P device address when receiving the P2P Invitation request frame. // Get the P2P device address when receiving the P2P Invitation request frame.
rtw_p2p_get_peer_devaddr_by_invitation( dev, info, wrqu, extra); rtw_p2p_get_peer_devaddr_by_invitation( dev, info, wrqu, extra);
} } else if ( _rtw_memcmp( wrqu->data.pointer, "op_ch", 5 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "op_ch", 5 ) )
{
rtw_p2p_get_op_ch( dev, info, wrqu, extra); rtw_p2p_get_op_ch( dev, info, wrqu, extra);
} }
#ifdef CONFIG_WFD #ifdef CONFIG_WFD
else if ( _rtw_memcmp( wrqu->data.pointer, "peer_port", 9 ) ) else if ( _rtw_memcmp( wrqu->data.pointer, "peer_port", 9 ) ) {
{
rtw_p2p_get_peer_wfd_port( dev, info, wrqu, extra ); rtw_p2p_get_peer_wfd_port( dev, info, wrqu, extra );
} } else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_sa", 6 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_sa", 6 ) )
{
rtw_p2p_get_peer_wfd_session_available( dev, info, wrqu, extra ); rtw_p2p_get_peer_wfd_session_available( dev, info, wrqu, extra );
} } else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_pc", 6 ) ) {
else if ( _rtw_memcmp( wrqu->data.pointer, "wfd_pc", 6 ) )
{
rtw_p2p_get_peer_wfd_preferred_connection( dev, info, wrqu, extra ); rtw_p2p_get_peer_wfd_preferred_connection( dev, info, wrqu, extra );
} }
#endif // CONFIG_WFD #endif // CONFIG_WFD
@ -6569,56 +6530,6 @@ exit:
} }
#if 0
void mac_reg_dump(struct adapter *padapter)
{
int i,j=1;
DBG_871X("\n======= MAC REG =======\n");
for(i=0x0;i<0x300;i+=4)
{
if(j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) DBG_871X("\n");
}
for(i=0x400;i<0x800;i+=4)
{
if(j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) DBG_871X("\n");
}
}
void bb_reg_dump(struct adapter *padapter)
{
int i,j=1;
DBG_871X("\n======= BB REG =======\n");
for(i=0x800;i<0x1000;i+=4)
{
if(j%4==1) DBG_871X("0x%02x",i);
DBG_871X(" 0x%08x ",rtw_read32(padapter,i));
if((j++)%4 == 0) DBG_871X("\n");
}
}
void rf_reg_dump(struct adapter *padapter)
{
int i,j=1,path;
u32 value;
DBG_871X("\n======= RF REG =======\n");
for(path=0;path<2;path++)
{
DBG_871X("\nRF_Path(%x)\n",path);
for(i=0;i<0x100;i++)
{
value = PHY_QueryRFReg(padapter, (RF_RADIO_PATH_E)path,i, bMaskDWord);
if(j%4==1) DBG_871X("0x%02x ",i);
DBG_871X(" 0x%08x ",value);
if((j++)%4==0) DBG_871X("\n");
}
}
}
#endif
static void mac_reg_dump(struct adapter *padapter) static void mac_reg_dump(struct adapter *padapter)
{ {
int i,j=1; int i,j=1;
@ -6636,7 +6547,8 @@ static void mac_reg_dump(struct adapter *padapter)
if((j++)%4 == 0) printk("\n"); if((j++)%4 == 0) printk("\n");
} }
} }
void bb_reg_dump(struct adapter *padapter)
static void bb_reg_dump(struct adapter *padapter)
{ {
int i,j=1; int i,j=1;
printk("\n======= BB REG =======\n"); printk("\n======= BB REG =======\n");
@ -6648,7 +6560,8 @@ void bb_reg_dump(struct adapter *padapter)
if((j++)%4 == 0) printk("\n"); if((j++)%4 == 0) printk("\n");
} }
} }
void rf_reg_dump(struct adapter *padapter)
static void rf_reg_dump(struct adapter *padapter)
{ {
int i,j=1,path; int i,j=1,path;
u32 value; u32 value;

4
os_dep/mlme_linux.c
View file

@ -151,9 +151,6 @@ void rtw_init_mlme_timer(struct adapter *padapter)
#endif #endif
} }
extern void rtw_indicate_wx_assoc_event(struct adapter *padapter);
extern void rtw_indicate_wx_disassoc_event(struct adapter *padapter);
void rtw_os_indicate_connect(struct adapter *adapter) void rtw_os_indicate_connect(struct adapter *adapter)
{ {
struct mlme_priv *pmlmepriv = &(adapter->mlmepriv); struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);
@ -183,7 +180,6 @@ _func_exit_;
} }
extern void indicate_wx_scan_complete_event(struct adapter *padapter);
void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted) void rtw_os_indicate_scan_done( struct adapter *padapter, bool aborted)
{ {
#ifdef CONFIG_IOCTL_CFG80211 #ifdef CONFIG_IOCTL_CFG80211