diff options
Diffstat (limited to 'drivers/staging/rtl8712')
-rw-r--r-- | drivers/staging/rtl8712/drv_types.h | 6 | ||||
-rw-r--r-- | drivers/staging/rtl8712/osdep_service.h | 9 | ||||
-rw-r--r-- | drivers/staging/rtl8712/recv_linux.c | 14 | ||||
-rw-r--r-- | drivers/staging/rtl8712/recv_osdep.h | 1 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_cmd.h | 12 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl8712_event.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mlme.c | 4 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp_ioctl.c | 525 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_mp_ioctl.h | 46 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_pwrctrl.h | 22 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_sta_mgt.c | 5 | ||||
-rw-r--r-- | drivers/staging/rtl8712/rtl871x_xmit.c | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/sta_info.h | 2 | ||||
-rw-r--r-- | drivers/staging/rtl8712/usb_intf.c | 5 |
15 files changed, 34 insertions, 625 deletions
diff --git a/drivers/staging/rtl8712/drv_types.h b/drivers/staging/rtl8712/drv_types.h index 3d0a98b6d8e5..e62543d22b86 100644 --- a/drivers/staging/rtl8712/drv_types.h +++ b/drivers/staging/rtl8712/drv_types.h @@ -129,8 +129,8 @@ struct dvobj_priv { struct _adapter *padapter; u32 nr_endpoint; u8 ishighspeed; - uint(*inirp_init)(struct _adapter *adapter); - uint(*inirp_deinit)(struct _adapter *adapter); + uint (*inirp_init)(struct _adapter *adapter); + uint (*inirp_deinit)(struct _adapter *adapter); struct usb_device *pusbdev; }; @@ -166,7 +166,7 @@ struct _adapter { pid_t evtThread; struct task_struct *xmitThread; pid_t recvThread; - uint(*dvobj_init)(struct _adapter *adapter); + uint (*dvobj_init)(struct _adapter *adapter); void (*dvobj_deinit)(struct _adapter *adapter); struct net_device *pnetdev; int bup; diff --git a/drivers/staging/rtl8712/osdep_service.h b/drivers/staging/rtl8712/osdep_service.h index 5153ad9c2c75..36348d900d34 100644 --- a/drivers/staging/rtl8712/osdep_service.h +++ b/drivers/staging/rtl8712/osdep_service.h @@ -71,7 +71,7 @@ static inline void _init_timer(struct timer_list *ptimer, static inline void _set_timer(struct timer_list *ptimer, u32 delay_time) { - mod_timer(ptimer, (jiffies+(delay_time*HZ/1000))); + mod_timer(ptimer, (jiffies+msecs_to_jiffies(delay_time))); } static inline void _cancel_timer(struct timer_list *ptimer, u8 *bcancelled) @@ -101,12 +101,9 @@ static inline void sleep_schedulable(int ms) { u32 delta; - delta = (ms * HZ) / 1000;/*(ms)*/ - if (delta == 0) - delta = 1;/* 1 ms */ + delta = msecs_to_jiffies(ms);/*(ms)*/ set_current_state(TASK_INTERRUPTIBLE); - if (schedule_timeout(delta) != 0) - return; + schedule_timeout(delta); } static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer) diff --git a/drivers/staging/rtl8712/recv_linux.c b/drivers/staging/rtl8712/recv_linux.c index 0631f3638257..409c8c897256 100644 --- a/drivers/staging/rtl8712/recv_linux.c +++ b/drivers/staging/rtl8712/recv_linux.c @@ -137,20 +137,6 @@ _recv_indicatepkt_drop: precvpriv->rx_drop++; } -void r8712_os_read_port(struct _adapter *padapter, struct recv_buf *precvbuf) -{ - struct recv_priv *precvpriv = &padapter->recvpriv; - - precvbuf->ref_cnt--; - /*free skb in recv_buf*/ - dev_kfree_skb_any(precvbuf->pskb); - precvbuf->pskb = NULL; - precvbuf->reuse = false; - if (!precvbuf->irp_pending) - r8712_read_port(padapter, precvpriv->ff_hwaddr, 0, - (unsigned char *)precvbuf); -} - static void _r8712_reordering_ctrl_timeout_handler (void *FunctionContext) { struct recv_reorder_ctrl *preorder_ctrl = diff --git a/drivers/staging/rtl8712/recv_osdep.h b/drivers/staging/rtl8712/recv_osdep.h index f4384ef00868..1f4986e940a3 100644 --- a/drivers/staging/rtl8712/recv_osdep.h +++ b/drivers/staging/rtl8712/recv_osdep.h @@ -46,7 +46,6 @@ int r8712_os_recvbuf_resource_alloc(struct _adapter *padapter, struct recv_buf *precvbuf); int r8712_os_recvbuf_resource_free(struct _adapter *padapter, struct recv_buf *precvbuf); -void r8712_os_read_port(struct _adapter *padapter, struct recv_buf *precvbuf); void r8712_init_recv_timer(struct recv_reorder_ctrl *preorder_ctrl); #endif diff --git a/drivers/staging/rtl8712/rtl8712_cmd.h b/drivers/staging/rtl8712/rtl8712_cmd.h index 039ab3e97172..67e9e910aef9 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.h +++ b/drivers/staging/rtl8712/rtl8712_cmd.h @@ -109,16 +109,16 @@ enum rtl8712_h2c_cmd { GEN_CMD_CODE(_DisconnectCtrlEx), /*61*/ /* To do, modify these h2c cmd, add or delete */ - GEN_CMD_CODE(_GetH2cLbk) , + GEN_CMD_CODE(_GetH2cLbk), /* WPS extra IE */ - GEN_CMD_CODE(_SetProbeReqExtraIE) , - GEN_CMD_CODE(_SetAssocReqExtraIE) , - GEN_CMD_CODE(_SetProbeRspExtraIE) , - GEN_CMD_CODE(_SetAssocRspExtraIE) , + GEN_CMD_CODE(_SetProbeReqExtraIE), + GEN_CMD_CODE(_SetAssocReqExtraIE), + GEN_CMD_CODE(_SetProbeRspExtraIE), + GEN_CMD_CODE(_SetAssocRspExtraIE), /* the following is driver will do */ - GEN_CMD_CODE(_GetCurDataRate) , + GEN_CMD_CODE(_GetCurDataRate), GEN_CMD_CODE(_GetTxRetrycnt), /* to record times that Tx retry to * transmit packet after association diff --git a/drivers/staging/rtl8712/rtl8712_event.h b/drivers/staging/rtl8712/rtl8712_event.h index 3d7f79efa2c1..29a4c23a0d23 100644 --- a/drivers/staging/rtl8712/rtl8712_event.h +++ b/drivers/staging/rtl8712/rtl8712_event.h @@ -27,7 +27,7 @@ #define _RTL8712_EVENT_H_ void r8712_event_handle(struct _adapter *padapter, uint *peventbuf); -void r8712_got_addbareq_event_callback(struct _adapter *adapter , u8 *pbuf); +void r8712_got_addbareq_event_callback(struct _adapter *adapter, u8 *pbuf); enum rtl8712_c2h_event { GEN_EVT_CODE(_Read_MACREG) = 0, /*0*/ diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index 73b7d864ccbd..9bb364f04fd4 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -196,7 +196,7 @@ static inline char *translate_scan(struct _adapter *padapter, if (p && ht_ielen > 0) { ht_cap = true; pht_capie = (struct ieee80211_ht_cap *)(p + 2); - memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); + memcpy(&mcs_rate, pht_capie->supp_mcs_set, 2); } /* Add the protocol name */ iwe.cmd = SIOCGIWNAME; @@ -1436,7 +1436,7 @@ static int r8711_wx_get_rate(struct net_device *dev, if (p && ht_ielen > 0) { ht_cap = true; pht_capie = (struct ieee80211_ht_cap *)(p + 2); - memcpy(&mcs_rate , pht_capie->supp_mcs_set, 2); + memcpy(&mcs_rate, pht_capie->supp_mcs_set, 2); bw_40MHz = (pht_capie->cap_info & IEEE80211_HT_CAP_SUP_WIDTH) ? 1 : 0; short_GI = (pht_capie->cap_info & diff --git a/drivers/staging/rtl8712/rtl871x_mlme.c b/drivers/staging/rtl8712/rtl871x_mlme.c index b7462e8145d6..977a83358056 100644 --- a/drivers/staging/rtl8712/rtl871x_mlme.c +++ b/drivers/staging/rtl8712/rtl871x_mlme.c @@ -93,7 +93,7 @@ struct wlan_network *_r8712_alloc_network(struct mlme_priv *pmlmepriv) return NULL; spin_lock_irqsave(&free_queue->lock, irqL); plist = free_queue->queue.next; - pnetwork = LIST_CONTAINOR(plist , struct wlan_network, list); + pnetwork = LIST_CONTAINOR(plist, struct wlan_network, list); list_del_init(&pnetwork->list); pnetwork->last_scanned = jiffies; pmlmepriv->num_of_scanned++; @@ -499,7 +499,7 @@ static int is_desired_network(struct _adapter *adapter, } /* TODO: Perry : For Power Management */ -void r8712_atimdone_event_callback(struct _adapter *adapter , u8 *pbuf) +void r8712_atimdone_event_callback(struct _adapter *adapter, u8 *pbuf) { } diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c index a16f15e91992..0b5461208eb9 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.c +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.c @@ -575,26 +575,6 @@ uint oid_rt_pro_set_single_tone_tx_hdl(struct oid_par_priv return RNDIS_STATUS_SUCCESS; } -uint oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - struct ndis_802_11_ssid *pssid; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - *poid_par_priv->bytes_needed = (u32)sizeof(struct ndis_802_11_ssid); - *poid_par_priv->bytes_rw = 0; - if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) - return RNDIS_STATUS_INVALID_LENGTH; - pssid = (struct ndis_802_11_ssid *)poid_par_priv->information_buf; - if (mp_start_joinbss(Adapter, pssid) == _FAIL) - status = RNDIS_STATUS_NOT_ACCEPTED; - *poid_par_priv->bytes_rw = sizeof(struct ndis_802_11_ssid); - return status; -} - uint oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv) { @@ -696,172 +676,6 @@ uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv) return status; } -uint oid_rt_pro_burst_read_register_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct burst_rw_reg *pBstRwReg; - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - pBstRwReg = (struct burst_rw_reg *)poid_par_priv->information_buf; - r8712_read_mem(Adapter, pBstRwReg->offset, (u32)pBstRwReg->len, - pBstRwReg->Data); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_burst_write_register_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct burst_rw_reg *pBstRwReg; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - pBstRwReg = (struct burst_rw_reg *)poid_par_priv->information_buf; - r8712_write_mem(Adapter, pBstRwReg->offset, (u32)pBstRwReg->len, - pBstRwReg->Data); - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv) -{ - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct eeprom_rw_param *pEEPROM; - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - pEEPROM = (struct eeprom_rw_param *)poid_par_priv->information_buf; - pEEPROM->value = r8712_eeprom_read16(Adapter, - (u16)(pEEPROM->offset >> 1)); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_write16_eeprom_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct eeprom_rw_param *pEEPROM; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - pEEPROM = (struct eeprom_rw_param *)poid_par_priv->information_buf; - r8712_eeprom_write16(Adapter, (u16)(pEEPROM->offset >> 1), - pEEPROM->value); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro8711_wi_poll_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct mp_wiparam *pwi_param; - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < sizeof(struct mp_wiparam)) - return RNDIS_STATUS_INVALID_LENGTH; - if (Adapter->mppriv.workparam.bcompleted == false) - return RNDIS_STATUS_NOT_ACCEPTED; - pwi_param = (struct mp_wiparam *)poid_par_priv->information_buf; - memcpy(pwi_param, &Adapter->mppriv.workparam, - sizeof(struct mp_wiparam)); - Adapter->mppriv.act_in_progress = false; - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro8711_pkt_loss_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < sizeof(uint) * 2) - return RNDIS_STATUS_INVALID_LENGTH; - if (*(uint *)poid_par_priv->information_buf == 1) - Adapter->mppriv.rx_pktloss = 0; - *((uint *)poid_par_priv->information_buf+1) = - Adapter->mppriv.rx_pktloss; - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_rd_attrib_mem_hdl(struct oid_par_priv *poid_par_priv) -{ - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_wr_attrib_mem_hdl(struct oid_par_priv *poid_par_priv) -{ - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (r8712_setrfintfs_cmd(Adapter, *(unsigned char *) - poid_par_priv->information_buf) == _FAIL) - status = RNDIS_STATUS_NOT_ACCEPTED; - return status; -} - -uint oid_rt_poll_rx_status_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - memcpy(poid_par_priv->information_buf, - (unsigned char *)&Adapter->mppriv.rxstat, - sizeof(struct recv_stat)); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_cfg_debug_message_hdl(struct oid_par_priv - *poid_par_priv) -{ - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_set_data_rate_ex_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (r8712_setdatarate_cmd(Adapter, - poid_par_priv->information_buf) != _SUCCESS) - status = RNDIS_STATUS_NOT_ACCEPTED; - return status; -} - uint oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv) { struct _adapter *Adapter = (struct _adapter *) @@ -890,251 +704,6 @@ uint oid_rt_get_thermal_meter_hdl(struct oid_par_priv *poid_par_priv) return RNDIS_STATUS_SUCCESS; } -uint oid_rt_pro_set_power_tracking_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < sizeof(u8)) - return RNDIS_STATUS_INVALID_LENGTH; - if (!r8712_setptm_cmd(Adapter, *((u8 *)poid_par_priv->information_buf))) - status = RNDIS_STATUS_NOT_ACCEPTED; - return status; -} - -uint oid_rt_pro_set_basic_rate_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - u8 mpdatarate[NumRates] = {11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0, 0xff}; - uint status = RNDIS_STATUS_SUCCESS; - u32 ratevalue; - u8 datarates[NumRates]; - int i; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - ratevalue = *((u32 *)poid_par_priv->information_buf); - for (i = 0; i < NumRates; i++) { - if (ratevalue == mpdatarate[i]) - datarates[i] = mpdatarate[i]; - else - datarates[i] = 0xff; - } - if (r8712_setbasicrate_cmd(Adapter, datarates) != _SUCCESS) - status = RNDIS_STATUS_NOT_ACCEPTED; - return status; -} - -uint oid_rt_pro_qry_pwrstate_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < 8) - return RNDIS_STATUS_INVALID_LENGTH; - *poid_par_priv->bytes_rw = 8; - memcpy(poid_par_priv->information_buf, - &(Adapter->pwrctrlpriv.pwr_mode), 8); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_set_pwrstate_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint pwr_mode, smart_ps; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - *poid_par_priv->bytes_rw = 0; - *poid_par_priv->bytes_needed = 8; - if (poid_par_priv->information_buf_len < 8) - return RNDIS_STATUS_INVALID_LENGTH; - pwr_mode = *(uint *)(poid_par_priv->information_buf); - smart_ps = *(uint *)((addr_t)poid_par_priv->information_buf + 4); - if (pwr_mode != Adapter->pwrctrlpriv.pwr_mode || smart_ps != - Adapter->pwrctrlpriv.smart_ps) - r8712_set_ps_mode(Adapter, pwr_mode, smart_ps); - *poid_par_priv->bytes_rw = 8; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_h2c_set_rate_table_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - struct setratable_parm *prate_table; - u8 res; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - *poid_par_priv->bytes_needed = sizeof(struct setratable_parm); - if (poid_par_priv->information_buf_len < - sizeof(struct setratable_parm)) - return RNDIS_STATUS_INVALID_LENGTH; - prate_table = (struct setratable_parm *)poid_par_priv->information_buf; - res = r8712_setrttbl_cmd(Adapter, prate_table); - if (res == _FAIL) - status = RNDIS_STATUS_FAILURE; - return status; -} - -uint oid_rt_pro_h2c_get_rate_table_hdl(struct oid_par_priv - *poid_par_priv) -{ - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_encryption_ctrl_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - struct security_priv *psecuritypriv = &Adapter->securitypriv; - enum ENCRY_CTRL_STATE encry_mode = 0; - - *poid_par_priv->bytes_needed = sizeof(u8); - if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) - return RNDIS_STATUS_INVALID_LENGTH; - - if (poid_par_priv->type_of_oid == SET_OID) { - encry_mode = *((u8 *)poid_par_priv->information_buf); - switch (encry_mode) { - case HW_CONTROL: - psecuritypriv->sw_decrypt = false; - psecuritypriv->sw_encrypt = false; - break; - case SW_CONTROL: - psecuritypriv->sw_decrypt = true; - psecuritypriv->sw_encrypt = true; - break; - case HW_ENCRY_SW_DECRY: - psecuritypriv->sw_decrypt = true; - psecuritypriv->sw_encrypt = false; - break; - case SW_ENCRY_HW_DECRY: - psecuritypriv->sw_decrypt = false; - psecuritypriv->sw_encrypt = true; - break; - } - } else { - if ((psecuritypriv->sw_encrypt == false) && - (psecuritypriv->sw_decrypt == false)) - encry_mode = HW_CONTROL; - else if ((psecuritypriv->sw_encrypt == false) && - (psecuritypriv->sw_decrypt == true)) - encry_mode = HW_ENCRY_SW_DECRY; - else if ((psecuritypriv->sw_encrypt == true) && - (psecuritypriv->sw_decrypt == false)) - encry_mode = SW_ENCRY_HW_DECRY; - else if ((psecuritypriv->sw_encrypt == true) && - (psecuritypriv->sw_decrypt == true)) - encry_mode = SW_CONTROL; - *(u8 *)poid_par_priv->information_buf = encry_mode; - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - } - return RNDIS_STATUS_SUCCESS; -} -/*----------------------------------------------------------------------*/ -uint oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - uint status = RNDIS_STATUS_SUCCESS; - - struct sta_info *psta = NULL; - u8 *macaddr; - - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - - *poid_par_priv->bytes_needed = ETH_ALEN; - if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) - return RNDIS_STATUS_INVALID_LENGTH; - macaddr = (u8 *) poid_par_priv->information_buf; - psta = r8712_get_stainfo(&Adapter->stapriv, macaddr); - if (psta == NULL) { /* the sta in sta_info_queue => do nothing*/ - psta = r8712_alloc_stainfo(&Adapter->stapriv, macaddr); - if (psta == NULL) - status = RNDIS_STATUS_FAILURE; - } - return status; -} -/*-------------------------------------------------------------------------*/ -uint oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - unsigned long irqL; - - struct sta_info *psta = NULL; - u8 *macaddr; - - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - - *poid_par_priv->bytes_needed = ETH_ALEN; - if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) - return RNDIS_STATUS_INVALID_LENGTH; - - macaddr = (u8 *)poid_par_priv->information_buf; - - psta = r8712_get_stainfo(&Adapter->stapriv, macaddr); - if (psta != NULL) { - spin_lock_irqsave(&(Adapter->stapriv.sta_hash_lock), irqL); - r8712_free_stainfo(Adapter, psta); - spin_unlock_irqrestore(&(Adapter->stapriv.sta_hash_lock), irqL); - } - - return RNDIS_STATUS_SUCCESS; -} -/*--------------------------------------------------------------------------*/ -static u32 mp_query_drv_var(struct _adapter *padapter, u8 offset, u32 var) -{ - return var; -} - -uint oid_rt_pro_query_dr_variable_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - - struct DR_VARIABLE_STRUCT *pdrv_var; - - if (poid_par_priv->type_of_oid != QUERY_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - *poid_par_priv->bytes_needed = sizeof(struct DR_VARIABLE_STRUCT); - if (poid_par_priv->information_buf_len < *poid_par_priv->bytes_needed) - return RNDIS_STATUS_INVALID_LENGTH; - pdrv_var = (struct DR_VARIABLE_STRUCT *)poid_par_priv->information_buf; - pdrv_var->variable = mp_query_drv_var(Adapter, pdrv_var->offset, - pdrv_var->variable); - *poid_par_priv->bytes_rw = poid_par_priv->information_buf_len; - return RNDIS_STATUS_SUCCESS; -} - -/*--------------------------------------------------------------------------*/ -uint oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv) -{ - return RNDIS_STATUS_SUCCESS; -} -/*------------------------------------------------------------------------*/ uint oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv) { struct _adapter *Adapter = (struct _adapter *) @@ -1192,38 +761,6 @@ uint oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv) return status; } /*----------------------------------------------------------------------*/ -uint oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - struct PGPKT_STRUCT *ppgpkt; - - *poid_par_priv->bytes_rw = 0; - if (poid_par_priv->information_buf_len < sizeof(struct PGPKT_STRUCT)) - return RNDIS_STATUS_INVALID_LENGTH; - ppgpkt = (struct PGPKT_STRUCT *)poid_par_priv->information_buf; - if (poid_par_priv->type_of_oid == QUERY_OID) { - if (r8712_efuse_pg_packet_read(Adapter, ppgpkt->offset, - ppgpkt->data) == true) - *poid_par_priv->bytes_rw = - poid_par_priv->information_buf_len; - else - status = RNDIS_STATUS_FAILURE; - } else { - if (r8712_efuse_reg_init(Adapter) == true) { - if (r8712_efuse_pg_packet_write(Adapter, ppgpkt->offset, - ppgpkt->word_en, ppgpkt->data) == true) - *poid_par_priv->bytes_rw = - poid_par_priv->information_buf_len; - else - status = RNDIS_STATUS_FAILURE; - r8712_efuse_reg_uninit(Adapter); - } else - status = RNDIS_STATUS_FAILURE; - } - return status; -} uint oid_rt_get_efuse_current_size_hdl(struct oid_par_priv *poid_par_priv) @@ -1319,24 +856,6 @@ uint oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv) return RNDIS_STATUS_SUCCESS; } -uint oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - u32 crystal_cap = 0; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < sizeof(u32)) - return RNDIS_STATUS_INVALID_LENGTH; - crystal_cap = *((u32 *)poid_par_priv->information_buf);/*4*/ - if (crystal_cap > 0xf) - return RNDIS_STATUS_NOT_ACCEPTED; - Adapter->mppriv.curr_crystalcap = crystal_cap; - r8712_SetCrystalCap(Adapter); - return RNDIS_STATUS_SUCCESS; -} - uint oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv) { @@ -1378,50 +897,6 @@ uint oid_rt_set_rx_packet_type_hdl(struct oid_par_priv return RNDIS_STATUS_SUCCESS; } -uint oid_rt_pro_set_tx_agc_offset_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - u32 txagc; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - if (poid_par_priv->information_buf_len < sizeof(u32)) - return RNDIS_STATUS_INVALID_LENGTH; - txagc = *(u32 *)poid_par_priv->information_buf; - r8712_SetTxAGCOffset(Adapter, txagc); - return RNDIS_STATUS_SUCCESS; -} - -uint oid_rt_pro_set_pkt_test_mode_hdl(struct oid_par_priv - *poid_par_priv) -{ - struct _adapter *Adapter = (struct _adapter *) - (poid_par_priv->adapter_context); - uint status = RNDIS_STATUS_SUCCESS; - struct mlme_priv *pmlmepriv = &Adapter->mlmepriv; - struct mp_priv *pmppriv = &Adapter->mppriv; - u32 type; - - if (poid_par_priv->type_of_oid != SET_OID) - return RNDIS_STATUS_NOT_ACCEPTED; - - if (poid_par_priv->information_buf_len < sizeof(u32)) - return RNDIS_STATUS_INVALID_LENGTH; - - type = *(u32 *)poid_par_priv->information_buf; - - if (_LOOPBOOK_MODE_ == type) { - pmppriv->mode = type; - set_fwstate(pmlmepriv, WIFI_MP_LPBK_STATE); /*append txdesc*/ - } else if (_2MAC_MODE_ == type) { - pmppriv->mode = type; - _clr_fwstate_(pmlmepriv, WIFI_MP_LPBK_STATE); - } else - status = RNDIS_STATUS_NOT_ACCEPTED; - return status; -} /*--------------------------------------------------------------------------*/ /*Linux*/ unsigned int mp_ioctl_xmit_packet_hdl(struct oid_par_priv *poid_par_priv) diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h index 850143d5dee3..8e7c7f8b69f9 100644 --- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h +++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h @@ -86,41 +86,8 @@ struct DR_VARIABLE_STRUCT { int mp_start_joinbss(struct _adapter *padapter, struct ndis_802_11_ssid *pssid); /* oid_rtl_seg_87_11_00 */ -uint oid_rt_pro8711_join_bss_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_read_register_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_write_register_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_burst_read_register_hdl(struct oid_par_priv* - poid_par_priv); -uint oid_rt_pro_burst_write_register_hdl(struct oid_par_priv* - poid_par_priv); -uint oid_rt_pro_write_txcmd_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_read16_eeprom_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_write16_eeprom_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro8711_wi_poll_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro8711_pkt_loss_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_rd_attrib_mem_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_wr_attrib_mem_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_rf_intfs_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_poll_rx_status_hdl(struct oid_par_priv *poid_par_priv); -/* oid_rtl_seg_87_11_20 */ -uint oid_rt_pro_cfg_debug_message_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_data_rate_ex_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_basic_rate_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_power_tracking_hdl( - struct oid_par_priv *poid_par_priv); -/* oid_rtl_seg_87_11_50 */ -uint oid_rt_pro_qry_pwrstate_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_pwrstate_hdl( - struct oid_par_priv *poid_par_priv); -/* oid_rtl_seg_87_11_F0 */ -uint oid_rt_pro_h2c_set_rate_table_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_h2c_get_rate_table_hdl( - struct oid_par_priv *poid_par_priv); /* oid_rtl_seg_81_80_00 */ uint oid_rt_pro_set_data_rate_hdl( struct oid_par_priv *poid_par_priv); @@ -159,28 +126,15 @@ uint oid_rt_pro_write_rf_reg_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_read_rf_reg_hdl(struct oid_par_priv *poid_par_priv); /* oid_rtl_seg_81_85 */ uint oid_rt_wireless_mode_hdl(struct oid_par_priv *poid_par_priv); -/* oid_rtl_seg_87_12_00 */ -uint oid_rt_pro_encryption_ctrl_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_add_sta_info_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_dele_sta_info_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_query_dr_variable_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_read_efuse_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_write_efuse_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_rw_efuse_pgpkt_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_get_efuse_current_size_hdl( struct oid_par_priv *poid_par_priv); uint oid_rt_pro_efuse_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_pro_efuse_map_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_set_bandwidth_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_set_crystal_cap_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_set_rx_packet_type_hdl(struct oid_par_priv *poid_par_priv); uint oid_rt_get_efuse_max_size_hdl(struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_tx_agc_offset_hdl( - struct oid_par_priv *poid_par_priv); -uint oid_rt_pro_set_pkt_test_mode_hdl( - struct oid_par_priv *poid_par_priv); uint oid_rt_get_thermal_meter_hdl( struct oid_par_priv *poid_par_priv); uint oid_rt_reset_phy_rx_packet_count_hdl( diff --git a/drivers/staging/rtl8712/rtl871x_pwrctrl.h b/drivers/staging/rtl8712/rtl871x_pwrctrl.h index 0526ba077bfc..dbfb55523545 100644 --- a/drivers/staging/rtl8712/rtl871x_pwrctrl.h +++ b/drivers/staging/rtl8712/rtl871x_pwrctrl.h @@ -33,17 +33,17 @@ #define CMD_ALIVE BIT(2) enum Power_Mgnt { - PS_MODE_ACTIVE = 0 , - PS_MODE_MIN , - PS_MODE_MAX , - PS_MODE_DTIM , - PS_MODE_VOIP , - PS_MODE_UAPSD_WMM , - PS_MODE_UAPSD , - PS_MODE_IBSS , - PS_MODE_WWLAN , - PM_Radio_Off , - PM_Card_Disable , + PS_MODE_ACTIVE = 0, + PS_MODE_MIN, + PS_MODE_MAX, + PS_MODE_DTIM, + PS_MODE_VOIP, + PS_MODE_UAPSD_WMM, + PS_MODE_UAPSD, + PS_MODE_IBSS, + PS_MODE_WWLAN, + PM_Radio_Off, + PM_Card_Disable, PS_MODE_NUM }; diff --git a/drivers/staging/rtl8712/rtl871x_sta_mgt.c b/drivers/staging/rtl8712/rtl871x_sta_mgt.c index 4c9b98e8210e..1752121ff494 100644 --- a/drivers/staging/rtl8712/rtl871x_sta_mgt.c +++ b/drivers/staging/rtl8712/rtl871x_sta_mgt.c @@ -83,9 +83,8 @@ static void mfree_all_stainfo(struct sta_priv *pstapriv) spin_lock_irqsave(&pstapriv->sta_hash_lock, irqL); phead = &pstapriv->free_sta_queue.queue; plist = phead->next; - while ((end_of_queue_search(phead, plist)) == false) { + while ((end_of_queue_search(phead, plist)) == false) plist = plist->next; - } spin_unlock_irqrestore(&pstapriv->sta_hash_lock, irqL); } @@ -228,7 +227,7 @@ void r8712_free_all_stainfo(struct _adapter *padapter) struct sta_info, hash_list); plist = plist->next; if (pbcmc_stainfo != psta) - r8712_free_stainfo(padapter , psta); + r8712_free_stainfo(padapter, psta); } } spin_unlock_irqrestore(&pstapriv->sta_hash_lock, irqL); diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index 62a377e7fdc7..a28af03c9d8a 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -471,7 +471,7 @@ static sint xmitframe_swencrypt(struct _adapter *padapter, return _SUCCESS; } -static sint make_wlanhdr(struct _adapter *padapter , u8 *hdr, +static sint make_wlanhdr(struct _adapter *padapter, u8 *hdr, struct pkt_attrib *pattrib) { u16 *qc; diff --git a/drivers/staging/rtl8712/sta_info.h b/drivers/staging/rtl8712/sta_info.h index c4e0ef2f52c6..742dfa0ca817 100644 --- a/drivers/staging/rtl8712/sta_info.h +++ b/drivers/staging/rtl8712/sta_info.h @@ -135,7 +135,7 @@ u32 _r8712_init_sta_priv(struct sta_priv *pstapriv); u32 _r8712_free_sta_priv(struct sta_priv *pstapriv); struct sta_info *r8712_alloc_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); -void r8712_free_stainfo(struct _adapter *padapter , struct sta_info *psta); +void r8712_free_stainfo(struct _adapter *padapter, struct sta_info *psta); void r8712_free_all_stainfo(struct _adapter *padapter); struct sta_info *r8712_get_stainfo(struct sta_priv *pstapriv, u8 *hwaddr); void r8712_init_bcmc_stainfo(struct _adapter *padapter); diff --git a/drivers/staging/rtl8712/usb_intf.c b/drivers/staging/rtl8712/usb_intf.c index 7d0d1719b136..f8b5b332e7c3 100644 --- a/drivers/staging/rtl8712/usb_intf.c +++ b/drivers/staging/rtl8712/usb_intf.c @@ -366,7 +366,6 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, struct net_device *pnetdev; struct usb_device *udev; - printk(KERN_INFO "r8712u: Staging version\n"); /* In this probe function, O.S. will provide the usb interface pointer * to driver. We have to increase the reference count of the usb device * structure by using the usb_get_dev function. @@ -463,7 +462,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, /* Use the mac address stored in the Efuse * offset = 0x12 for usb in efuse */ - memcpy(mac, &pdata[0x12], ETH_ALEN); + ether_addr_copy(mac, &pdata[0x12]); } eeprom_CustomerID = pdata[0x52]; switch (eeprom_CustomerID) { @@ -580,7 +579,7 @@ static int r871xu_drv_init(struct usb_interface *pusb_intf, } else dev_info(&udev->dev, "r8712u: MAC Address from efuse = %pM\n", mac); - memcpy(pnetdev->dev_addr, mac, ETH_ALEN); + ether_addr_copy(pnetdev->dev_addr, mac); } /* step 6. Load the firmware asynchronously */ if (rtl871x_load_fw(padapter)) |