#include <hal_intf.h>
#include <rtw_ioctl.h>
#include <rtw_version.h>
+
#include <usb_osintf.h>
-#include <usb_hal.h>
#ifdef CONFIG_BR_EXT
#include <rtw_br_ext.h>
#endif //CONFIG_BR_EXT
+#ifdef CONFIG_RF_GAIN_OFFSET
+#define REG_RF_BB_GAIN_OFFSET 0x55
+#define RF_GAIN_OFFSET_MASK 0xfffff
+#endif //CONFIG_RF_GAIN_OFFSET
+
MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Realtek Wireless Lan Driver");
MODULE_AUTHOR("Realtek Semiconductor Corp.");
int rtw_chip_version = 0x00;
int rtw_rfintfs = HWPI;
int rtw_lbkmode = 0;//RTL8712_AIR_TRX;
-
+int rtw_debug = 1;
int rtw_network_mode = Ndis802_11IBSS;//Ndis802_11Infrastructure;//infra, ad-hoc, auto
//NDIS_802_11_SSID ssid;
//int qos_enable = 0; //*
int rtw_ack_policy = NORMAL_ACK;
-int rtw_mp_mode = 0;
-
int rtw_software_encrypt = 0;
int rtw_software_decrypt = 0;
#ifdef CONFIG_80211N_HT
int rtw_ht_enable = 1;
-int rtw_cbw40_enable = 1;
+int rtw_cbw40_enable = 3; // 0 :diable, bit(0): enable 2.4g, bit(1): enable 5g
int rtw_ampdu_enable = 1;//for enable tx_ampdu
int rtw_rx_stbc = 1;// 0: disable, bit(0):enable 2.4g, bit(1):enable 5g, default is set to enable 2.4GHZ for IOT issue with bufflao's AP at 5GHZ
int rtw_ampdu_amsdu = 0;// 0: disabled, 1:enabled, 2:auto
int rtw_bt_ampdu =1 ;// 0:Disable BT control A-MPDU, 1:Enable BT control A-MPDU.
#endif
-int rtw_AcceptAddbaReq = true;// 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.
+int rtw_AcceptAddbaReq = _TRUE;// 0:Reject AP's Add BA req, 1:Accept AP's Add BA req.
int rtw_antdiv_cfg = 2; // 0:OFF , 1:ON, 2:decide by Efuse config
int rtw_antdiv_type = 0 ; //0:decide by efuse 1: for 88EE, 1Tx and 1RxCG are diversity.(2 Ant with SPDT), 2: for 88EE, 1Tx and 2Rx are diversity.( 2 Ant, Tx and RxCG are both on aux port, RxCS is on main port ), 3: for 88EE, 1Tx and 1RxCG are fixed.(1Ant, Tx and RxCG are both on aux port)
int rtw_80211d = 0;
#endif
+#ifdef CONFIG_REGULATORY_CTRL
+int rtw_regulatory_id =2;
+#else
+int rtw_regulatory_id = 0xff;// Regulatory tab id, 0xff = follow efuse's setting
+#endif
+module_param(rtw_regulatory_id, int, 0644);
+
+
#ifdef CONFIG_SPECIAL_SETTING_FOR_FUNAI_TV
int rtw_force_ant = 2;//0 :normal, 1:Main ant, 2:Aux ant
int rtw_force_igi =0;//0 :normal
module_param(rtw_lbkmode, int, 0644);
module_param(rtw_network_mode, int, 0644);
module_param(rtw_channel, int, 0644);
-module_param(rtw_mp_mode, int, 0644);
module_param(rtw_wmm_enable, int, 0644);
module_param(rtw_vrtl_carrier_sense, int, 0644);
module_param(rtw_vcs_type, int, 0644);
#endif //CONFIG_LAYER2_ROAMING
#ifdef CONFIG_IOL
-bool rtw_force_iol=false;
-module_param(rtw_force_iol, bool, 0644);
-MODULE_PARM_DESC(rtw_force_iol,"Force to enable IOL");
+int rtw_fw_iol=1;// 0:Disable, 1:enable, 2:by usb speed
+module_param(rtw_fw_iol, int, 0644);
+MODULE_PARM_DESC(rtw_fw_iol,"FW IOL");
#endif //CONFIG_IOL
#ifdef CONFIG_FILE_FWIMG
uint rtw_notch_filter = RTW_NOTCH_FILTER;
module_param(rtw_notch_filter, uint, 0644);
MODULE_PARM_DESC(rtw_notch_filter, "0:Disable, 1:Enable, 2:Enable only for P2P");
+module_param_named(debug, rtw_debug, int, 0444);
+MODULE_PARM_DESC(debug, "Set debug level (1-9) (default 1)");
-static uint loadparam(PADAPTER padapter, struct net_device * pnetdev);
+static uint loadparam(PADAPTER padapter, _nic_hdl pnetdev);
int _netdev_open(struct net_device *pnetdev);
int netdev_open (struct net_device *pnetdev);
static int netdev_close (struct net_device *pnetdev);
#define RTW_PROC_NAME DRV_NAME
+#ifndef create_proc_entry
+/* dummy routines */
+void rtw_proc_remove_one(struct net_device *dev)
+{
+}
+
+void rtw_proc_init_one(struct net_device *dev)
+{
+}
+
+#else /* create_proc_entry not defined */
void rtw_proc_init_one(struct net_device *dev)
{
struct proc_dir_entry *dir_dev = NULL;
memcpy(rtw_proc_name, RTW_PROC_NAME, sizeof(RTW_PROC_NAME));
}
-#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, proc_net);
-#else
rtw_proc=create_proc_entry(rtw_proc_name, S_IFDIR, init_net.proc_net);
-#endif
if (rtw_proc == NULL) {
- DBG_871X(KERN_ERR "Unable to create rtw_proc directory\n");
+ DBG_8723A(KERN_ERR "Unable to create rtw_proc directory\n");
return;
}
entry = create_proc_read_entry("ver_info", S_IFREG | S_IRUGO, rtw_proc, proc_get_drv_version, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
}
if(rtw_proc_cnt == 0)
{
if(rtw_proc){
-#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- remove_proc_entry(rtw_proc_name, proc_net);
-#else
- remove_proc_entry(rtw_proc_name, init_net.proc_net);
-#endif
+ remove_proc_entry(rtw_proc_name,
+ init_net.proc_net);
rtw_proc = NULL;
}
}
- DBG_871X("Unable to create dir_dev directory\n");
+ DBG_8723A("Unable to create dir_dev directory\n");
return;
}
}
entry = create_proc_read_entry("write_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_write_reg, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_write_reg;
entry = create_proc_read_entry("read_reg", S_IFREG | S_IRUGO,
dir_dev, proc_get_read_reg, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_read_reg;
entry = create_proc_read_entry("fwstate", S_IFREG | S_IRUGO,
dir_dev, proc_get_fwstate, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("sec_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_sec_info, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mlmext_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_mlmext_state, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("qos_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_qos_option, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("ht_option", S_IFREG | S_IRUGO,
dir_dev, proc_get_ht_option, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_info, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("ap_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_ap_info, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("adapter_state", S_IFREG | S_IRUGO,
dir_dev, proc_get_adapter_state, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("trx_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_trx_info, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump1, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump2, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("mac_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_mac_reg_dump3, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump1, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump2, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("bb_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_bb_reg_dump3, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump1", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump1, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump2", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump2, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump3", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump3, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry = create_proc_read_entry("rf_reg_dump4", S_IFREG | S_IRUGO,
dir_dev, proc_get_rf_reg_dump4, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
}
entry = create_proc_read_entry("all_sta_info", S_IFREG | S_IRUGO,
dir_dev, proc_get_all_sta_info, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
#endif
entry = create_proc_read_entry("best_channel", S_IFREG | S_IRUGO,
dir_dev, proc_get_best_channel, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
#endif
entry = create_proc_read_entry("rx_signal", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_signal, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rx_signal;
#ifdef CONFIG_80211N_HT
+ entry = create_proc_read_entry("ht_enable", S_IFREG | S_IRUGO,
+ dir_dev, proc_get_ht_enable, dev);
+ if (!entry) {
+ DBG_8723A("Unable to create_proc_read_entry!\n");
+ return;
+ }
+ entry->write_proc = proc_set_ht_enable;
+
entry = create_proc_read_entry("cbw40_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_cbw40_enable, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_cbw40_enable;
entry = create_proc_read_entry("ampdu_enable", S_IFREG | S_IRUGO,
dir_dev, proc_get_ampdu_enable, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_ampdu_enable;
entry = create_proc_read_entry("rx_stbc", S_IFREG | S_IRUGO,
dir_dev, proc_get_rx_stbc, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rx_stbc;
entry = create_proc_read_entry("rssi_disp", S_IFREG | S_IRUGO,
dir_dev, proc_get_rssi_disp, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_rssi_disp;
entry = create_proc_read_entry("btcoex_dbg", S_IFREG | S_IRUGO,
dir_dev, proc_get_btcoex_dbg, dev);
if (!entry) {
- DBG_871X("Unable to create_proc_read_entry!\n");
+ DBG_8723A("Unable to create_proc_read_entry!\n");
return;
}
entry->write_proc = proc_set_btcoex_dbg;
#endif /*CONFIG_BT_COEXIST*/
+
+#if defined(DBG_CONFIG_ERROR_DETECT)
+ entry = create_proc_read_entry("sreset", S_IFREG | S_IRUGO,
+ dir_dev, proc_get_sreset, dev);
+ if (!entry) {
+ DBG_8723A("Unable to create_proc_read_entry!\n");
+ return;
+ }
+ entry->write_proc = proc_set_sreset;
+#endif /* DBG_CONFIG_ERROR_DETECT */
+
}
void rtw_proc_remove_one(struct net_device *dev)
#ifdef CONFIG_80211N_HT
remove_proc_entry("cbw40_enable", dir_dev);
+ remove_proc_entry("ht_enable", dir_dev);
+
remove_proc_entry("ampdu_enable", dir_dev);
remove_proc_entry("rx_stbc", dir_dev);
remove_proc_entry("btcoex_dbg", dir_dev);
#endif //CONFIG_BT_COEXIST
+#if defined(DBG_CONFIG_ERROR_DETECT)
+ remove_proc_entry("sreset", dir_dev);
+#endif /* DBG_CONFIG_ERROR_DETECT */
+
remove_proc_entry(dev->name, rtw_proc);
dir_dev = NULL;
if(rtw_proc){
remove_proc_entry("ver_info", rtw_proc);
-#if(LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- remove_proc_entry(rtw_proc_name, proc_net);
-#else
remove_proc_entry(rtw_proc_name, init_net.proc_net);
-#endif
rtw_proc = NULL;
}
}
}
#endif
+#endif //ifndef create_proc_entry
-uint loadparam( _adapter *padapter, struct net_device * pnetdev)
+uint loadparam( _adapter *padapter, _nic_hdl pnetdev)
{
uint status = _SUCCESS;
_func_enter_;
+ GlobalDebugLevel = rtw_debug;
registry_par->chip_version = (u8)rtw_chip_version;
registry_par->rfintfs = (u8)rtw_rfintfs;
registry_par->lbkmode = (u8)rtw_lbkmode;
registry_par->busy_thresh = (u16)rtw_busy_thresh;
//registry_par->qos_enable = (u8)rtw_qos_enable;
registry_par->ack_policy = (u8)rtw_ack_policy;
- registry_par->mp_mode = (u8)rtw_mp_mode;
registry_par->software_encrypt = (u8)rtw_software_encrypt;
registry_par->software_decrypt = (u8)rtw_software_decrypt;
#endif
#ifdef CONFIG_IOL
- registry_par->force_iol = rtw_force_iol;
+ registry_par->fw_iol = rtw_fw_iol;
#endif
#ifdef CONFIG_DUALMAC_CONCURRENT
registry_par->force_ant = (u8)rtw_force_ant;
registry_par->force_igi = (u8)rtw_force_igi;
#endif
+ registry_par->regulatory_tid = (u8)rtw_regulatory_id;
+
+
_func_exit_;
return status;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
struct sockaddr *addr = p;
- if(padapter->bup == false)
+ if(padapter->bup == _FALSE)
{
- //DBG_871X("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3],
+ //DBG_8723A("r8711_net_set_mac_address(), MAC=%x:%x:%x:%x:%x:%x\n", addr->sa_data[0], addr->sa_data[1], addr->sa_data[2], addr->sa_data[3],
//addr->sa_data[4], addr->sa_data[5]);
memcpy(padapter->eeprompriv.mac_addr, addr->sa_data, ETH_ALEN);
//memcpy(pnetdev->dev_addr, addr->sa_data, ETH_ALEN);
- //padapter->bset_hwaddr = true;
+ //padapter->bset_hwaddr = _TRUE;
}
return 0;
#endif
-#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
static const struct net_device_ops rtw_netdev_ops = {
.ndo_open = netdev_open,
.ndo_stop = netdev_close,
.ndo_get_stats = rtw_net_get_stats,
.ndo_do_ioctl = rtw_ioctl,
};
-#endif
int rtw_init_netdev_name(struct net_device *pnetdev, const char *ifname)
{
if(padapter->bDongle == 1)
{
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- TargetNetdev = dev_get_by_name("wlan0");
-#else
- #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- devnet = pnetdev->nd_net;
- #else
devnet = dev_net(pnetdev);
- #endif
TargetNetdev = dev_get_by_name(devnet, "wlan0");
-#endif
if(TargetNetdev) {
- DBG_871X("Force onboard module driver disappear !!!\n");
+ DBG_8723A("Force onboard module driver disappear !!!\n");
TargetAdapter = rtw_netdev_priv(TargetNetdev);
TargetAdapter->DriverState = DRIVER_DISAPPEAR;
if(dev_alloc_name(pnetdev, ifname) < 0)
{
- RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("dev_alloc_name, fail! \n"));
}
netif_carrier_off(pnetdev);
return 0;
}
+static const struct device_type wlan_type = {
+ .name = "wlan",
+};
+
struct net_device *rtw_init_netdev(_adapter *old_padapter)
{
_adapter *padapter;
if (!pnetdev)
return NULL;
+ pnetdev->dev.type = &wlan_type;
padapter = rtw_netdev_priv(pnetdev);
padapter->pnetdev = pnetdev;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24)
- SET_MODULE_OWNER(pnetdev);
-#endif
-
//pnetdev->init = NULL;
-#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
- DBG_871X("register rtw_netdev_ops to netdev_ops\n");
+ DBG_8723A("register rtw_netdev_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtw_netdev_ops;
-#else
- pnetdev->open = netdev_open;
- pnetdev->stop = netdev_close;
- pnetdev->hard_start_xmit = rtw_xmit_entry;
- pnetdev->set_mac_address = rtw_net_set_mac_address;
- pnetdev->get_stats = rtw_net_get_stats;
- pnetdev->do_ioctl = rtw_ioctl;
-#endif
-
#ifdef CONFIG_TCP_CSUM_OFFLOAD_TX
pnetdev->features |= NETIF_F_IP_CSUM;
#ifdef CONFIG_CONCURRENT_MODE
- if(padapter->isprimary == true)
+ if(padapter->isprimary == _TRUE)
#endif //CONFIG_CONCURRENT_MODE
{
padapter->cmdThread = kthread_run(rtw_cmd_thread, padapter, "RTW_CMD_THREAD");
if(IS_ERR(padapter->cmdThread))
_status = _FAIL;
else
- _rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema); //wait for cmd_thread to run
+ down(&padapter->cmdpriv.terminate_cmdthread_sema); //wait for cmd_thread to run
}
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_stop_drv_threads\n"));
#ifdef CONFIG_CONCURRENT_MODE
- if(padapter->isprimary == true)
+ if(padapter->isprimary == _TRUE)
#endif //CONFIG_CONCURRENT_MODE
{
//Below is to termindate rtw_cmd_thread & event_thread...
- _rtw_up_sema(&padapter->cmdpriv.cmd_queue_sema);
- //_rtw_up_sema(&padapter->cmdpriv.cmd_done_sema);
+ up(&padapter->cmdpriv.cmd_queue_sema);
+ //up(&padapter->cmdpriv.cmd_done_sema);
if(padapter->cmdThread){
- _rtw_down_sema(&padapter->cmdpriv.terminate_cmdthread_sema);
+ down(&padapter->cmdpriv.terminate_cmdthread_sema);
}
}
#ifdef CONFIG_EVENT_THREAD_MODE
- _rtw_up_sema(&padapter->evtpriv.evt_notify);
+ up(&padapter->evtpriv.evt_notify);
if(padapter->evtThread){
- _rtw_down_sema(&padapter->evtpriv.terminate_evtthread_sema);
+ down_interruptible(&padapter->evtpriv.terminate_evtthread_sema);
}
#endif
#ifdef CONFIG_XMIT_THREAD_MODE
// Below is to termindate tx_thread...
{
- _rtw_up_sema(&padapter->xmitpriv.xmit_sema);
- _rtw_down_sema(&padapter->xmitpriv.terminate_xmitthread_sema);
+ up(&padapter->xmitpriv.xmit_sema);
+ down(&padapter->xmitpriv.terminate_xmitthread_sema);
}
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated !\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt: rtw_xmit_thread can be terminated ! \n"));
#endif
#ifdef CONFIG_RECV_THREAD_MODE
// Below is to termindate rx_thread...
- _rtw_up_sema(&padapter->recvpriv.recv_sema);
- _rtw_down_sema(&padapter->recvpriv.terminate_recvthread_sema);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt:recv_thread can be terminated!\n"));
+ up(&padapter->recvpriv.recv_sema);
+ down(&padapter->recvpriv.terminate_recvthread_sema);
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("\n drv_halt:recv_thread can be terminated! \n"));
#endif
rtw_hal_stop_thread(padapter);
//ht_priv
#ifdef CONFIG_80211N_HT
- pmlmepriv->htpriv.ampdu_enable = false;//set to disabled
+ pmlmepriv->htpriv.ampdu_enable = _FALSE;//set to disabled
#endif
//security_priv
rtw_hal_def_value_init(padapter);
//misc.
- padapter->bReadPortCancel = false;
- padapter->bWritePortCancel = false;
+ padapter->bReadPortCancel = _FALSE;
+ padapter->bWritePortCancel = _FALSE;
padapter->bRxRSSIDisplay = 0;
+ padapter->bNotifyChannelChange = 0;
+#ifdef CONFIG_P2P
+ padapter->bShowGetP2PState = 1;
+#endif
return ret;
}
//hal_priv
rtw_hal_def_value_init(padapter);
- padapter->bReadPortCancel = false;
- padapter->bWritePortCancel = false;
+ padapter->bReadPortCancel = _FALSE;
+ padapter->bWritePortCancel = _FALSE;
padapter->bRxRSSIDisplay = 0;
pmlmepriv->scan_interval = SCAN_INTERVAL;// 30*2 sec = 60sec
padapter->xmitpriv.tx_pkts = 0;
padapter->recvpriv.rx_pkts = 0;
- pmlmepriv->LinkDetectInfo.bBusyTraffic = false;
+ pmlmepriv->LinkDetectInfo.bBusyTraffic = _FALSE;
_clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY |_FW_UNDER_LINKING);
goto exit;
}
-#ifdef CONFIG_IOCTL_CFG80211
#ifdef CONFIG_P2P
+ rtw_init_wifidirect_timers(padapter);
+ init_wifidirect_info(padapter, P2P_ROLE_DISABLE);
+ reset_global_wifidirect_info(padapter);
+ #ifdef CONFIG_IOCTL_CFG80211
rtw_init_cfg80211_wifidirect_info(padapter);
-#endif //CONFIG_P2P
-#endif //CONFIG_IOCTL_CFG80211
+ #endif
+#ifdef CONFIG_WFD
+ if(rtw_init_wifi_display_info(padapter) == _FAIL)
+ RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init init_wifi_display_info\n"));
+#endif
+#endif /* CONFIG_P2P */
if(init_mlme_ext_priv(padapter) == _FAIL)
{
#ifdef CONFIG_TDLS
if(rtw_init_tdls_info(padapter) == _FAIL)
{
- DBG_871X("Can't rtw_init_tdls_info\n");
+ DBG_8723A("Can't rtw_init_tdls_info\n");
ret8=_FAIL;
goto exit;
}
if(_rtw_init_xmit_priv(&padapter->xmitpriv, padapter) == _FAIL)
{
- DBG_871X("Can't _rtw_init_xmit_priv\n");
+ DBG_8723A("Can't _rtw_init_xmit_priv\n");
ret8=_FAIL;
goto exit;
}
if(_rtw_init_recv_priv(&padapter->recvpriv, padapter) == _FAIL)
{
- DBG_871X("Can't _rtw_init_recv_priv\n");
+ DBG_8723A("Can't _rtw_init_recv_priv\n");
ret8=_FAIL;
goto exit;
}
+ // We don't need to memset padapter->XXX to zero, because adapter is allocated by rtw_zvmalloc().
+ //memset((unsigned char *)&padapter->securitypriv, 0, sizeof (struct security_priv));
+
+ //_init_timer(&(padapter->securitypriv.tkip_timer), padapter->pifp, rtw_use_tkipkey_handler, padapter);
+
if(_rtw_init_sta_priv(&padapter->stapriv) == _FAIL)
{
- DBG_871X("Can't _rtw_init_sta_priv\n");
+ DBG_8723A("Can't _rtw_init_sta_priv\n");
ret8=_FAIL;
goto exit;
}
padapter->stapriv.padapter = padapter;
-
+ padapter->setband = GHZ24_50;
rtw_init_bcmc_stainfo(padapter);
rtw_init_pwrctrl_priv(padapter);
-#ifdef CONFIG_MP_INCLUDED
- if (init_mp_priv(padapter) == _FAIL) {
- DBG_871X("%s: initialize MP private data Fail!\n", __func__);
- }
-#endif
+ //memset((u8 *)&padapter->qospriv, 0, sizeof (struct qos_priv));//move to mlme_priv
ret8 = rtw_init_default_value(padapter);
rtw_hal_sreset_init(padapter);
#endif
-#ifdef CONFIG_INTEL_WIDI
- if(rtw_init_intel_widi(padapter) == _FAIL)
- {
- DBG_871X("Can't rtw_init_intel_widi\n");
- ret8=_FAIL;
- goto exit;
- }
-#endif //CONFIG_INTEL_WIDI
-
-#ifdef CONFIG_WAPI_SUPPORT
- padapter->WapiSupport = true; //set true temp, will revise according to Efuse or Registry value later.
- rtw_wapi_init(padapter);
-#endif
-
#ifdef CONFIG_BR_EXT
- _rtw_spinlock_init(&padapter->br_ext_lock);
+ spin_lock_init(&padapter->br_ext_lock);
#endif // CONFIG_BR_EXT
exit:
void rtw_cancel_dynamic_chk_timer(_adapter *padapter)
{
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n"));
}
#endif
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+rtw_cancel_all_timer\n"));
_cancel_timer_ex(&padapter->mlmepriv.assoc_timer);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel association timer complete! \n"));
//_cancel_timer_ex(&padapter->securitypriv.tkip_timer);
- //RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel tkip_timer!\n"));
+ //RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel tkip_timer! \n"));
_cancel_timer_ex(&padapter->mlmepriv.scan_to_timer);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel scan_to_timer! \n"));
_cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel dynamic_chk_timer! \n"));
// cancel sw led timer
rtw_hal_sw_led_deinit(padapter);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds!\n"));
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel DeInitSwLeds! \n"));
_cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer);
#ifdef CONFIG_SET_SCAN_DENY_TIMER
_cancel_timer_ex(&padapter->mlmepriv.set_scan_deny_timer);
- RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer!\n"));
+ rtw_clear_scan_deny(padapter);
+ RT_TRACE(_module_os_intfs_c_,_drv_info_,("rtw_cancel_all_timer:cancel set_scan_deny_timer! \n"));
#endif
#ifdef CONFIG_NEW_SIGNAL_STAT_PROCESS
_cancel_timer_ex(&padapter->recvpriv.signal_stat_timer);
#endif
+#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
+ if (padapter->HalFunc.hal_cancel_checkbthang_workqueue)
+ padapter->HalFunc.hal_cancel_checkbthang_workqueue(padapter);
+#endif
//cancel dm timer
rtw_hal_dm_deinit(padapter);
RT_TRACE(_module_os_intfs_c_,_drv_info_,("==>rtw_free_drv_sw"));
-#ifdef CONFIG_WAPI_SUPPORT
- rtw_wapi_free(padapter);
-#endif
-
//we can call rtw_p2p_enable here, but:
// 1. rtw_p2p_enable may have IO operation
// 2. rtw_p2p_enable is bundled with wext interface
_cancel_timer_ex( &pwdinfo->find_phase_timer );
_cancel_timer_ex( &pwdinfo->restore_p2p_state_timer );
_cancel_timer_ex( &pwdinfo->pre_tx_scan_timer);
+#ifdef CONFIG_CONCURRENT_MODE
+ _cancel_timer_ex( &pwdinfo->ap_p2p_switch_timer );
+#endif // CONFIG_CONCURRENT_MODE
rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE);
}
}
#endif
-
-#ifdef CONFIG_BR_EXT
- _rtw_spinlock_free(&padapter->br_ext_lock);
-#endif // CONFIG_BR_EXT
-
-#ifdef CONFIG_INTEL_WIDI
- rtw_free_intel_widi(padapter);
-#endif //CONFIG_INTEL_WIDI
-
free_mlme_ext_priv(&padapter->mlmeextpriv);
#ifdef CONFIG_TDLS
rtw_free_evt_priv(&padapter->evtpriv);
rtw_free_mlme_priv(&padapter->mlmepriv);
-
+#if defined(CONFIG_CHECK_BT_HANG) && defined(CONFIG_BT_COEXIST)
+ if (padapter->HalFunc.hal_free_checkbthang_workqueue)
+ padapter->HalFunc.hal_free_checkbthang_workqueue(padapter);
+#endif
//free_io_queue(padapter);
_rtw_free_xmit_priv(&padapter->xmitpriv);
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
_adapter *primary_padapter = padapter->pbuddy_adapter;
- DBG_871X("+871x_drv - if2_open, bup=%d\n", padapter->bup);
+ DBG_8723A("+871x_drv - if2_open, bup=%d\n", padapter->bup);
- if(primary_padapter->bup == false || primary_padapter->hw_init_completed == false)
+ if(primary_padapter->bup == _FALSE || primary_padapter->hw_init_completed == _FALSE)
{
_netdev_open(primary_padapter->pnetdev);
}
- if(padapter->bup == false && primary_padapter->bup == true &&
- primary_padapter->hw_init_completed == true)
+ if(padapter->bup == _FALSE && primary_padapter->bup == _TRUE &&
+ primary_padapter->hw_init_completed == _TRUE)
{
int i;
- padapter->bDriverStopped = false;
- padapter->bSurpriseRemoved = false;
- padapter->bCardDisableWOHSM = false;
+ padapter->bDriverStopped = _FALSE;
+ padapter->bSurpriseRemoved = _FALSE;
+ padapter->bCardDisableWOHSM = _FALSE;
// memcpy(padapter->HalData, primary_padapter->HalData, padapter->hal_data_sz);
rtw_hal_clone_data(padapter, primary_padapter);
}
- padapter->hw_init_completed = true;
+ padapter->hw_init_completed = _TRUE;
padapter->dir_dev = NULL;
rtw_cfg80211_init_wiphy(padapter);
#endif
- padapter->bup = true;
+ padapter->bup = _TRUE;
}
- padapter->net_closed = false;
+ padapter->net_closed = _FALSE;
_set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
else
rtw_netif_wake_queue(pnetdev);
-#ifdef CONFIG_P2P
- init_wifidirect_info( padapter, P2P_ROLE_DISABLE );
- reset_global_wifidirect_info( padapter );
-#ifdef CONFIG_WFD
- if(rtw_init_wifi_display_info(padapter) == _FAIL)
- {
- RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init init_wifi_display_info\n"));
-
- goto netdev_if2_open_error;
- }
-#endif //CONFIG_WFD
-#endif // CONFIG_P2P
-
- DBG_871X("-871x_drv - if2_open, bup=%d\n", padapter->bup);
+ DBG_8723A("-871x_drv - if2_open, bup=%d\n", padapter->bup);
return 0;
netdev_if2_open_error:
- padapter->bup = false;
+ padapter->bup = _FALSE;
netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev);
int ret;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
- _enter_critical_mutex(padapter->hw_init_mutex, NULL);
+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
ret = _netdev_if2_open(pnetdev);
- _exit_critical_mutex(padapter->hw_init_mutex, NULL);
+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
return ret;
}
{
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
- padapter->net_closed = true;
+ padapter->net_closed = _TRUE;
if(pnetdev)
{
#ifdef CONFIG_IOCTL_CFG80211
rtw_scan_abort(padapter);
- wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = false;
+ wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE;
#endif
return 0;
}
-#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
static const struct net_device_ops rtw_netdev_if2_ops = {
.ndo_open = netdev_if2_open,
.ndo_stop = netdev_if2_close,
.ndo_select_queue = rtw_select_queue,
#endif
};
-#endif
-_adapter *rtw_drv_if2_init(_adapter *primary_padapter, char *name,
- void (*set_intf_ops)(struct _io_ops *pops))
+ #include <usb_hal.h>
+_adapter *rtw_drv_if2_init(_adapter *primary_padapter, void (*set_intf_ops)(struct _io_ops *pops))
{
int res = _FAIL;
- struct net_device *pnetdev;
+ struct net_device *pnetdev = NULL;
_adapter *padapter = NULL;
struct dvobj_priv *pdvobjpriv;
u8 mac[ETH_ALEN];
if (!pnetdev)
goto error_rtw_drv_if2_init;
-#if (LINUX_VERSION_CODE>=KERNEL_VERSION(2,6,29))
- DBG_871X("register rtw_netdev_if2_ops to netdev_ops\n");
+ DBG_8723A("register rtw_netdev_if2_ops to netdev_ops\n");
pnetdev->netdev_ops = &rtw_netdev_if2_ops;
-#else
- pnetdev->open = netdev_if2_open;
- pnetdev->stop = netdev_if2_close;
-#endif
#ifdef CONFIG_NO_WIRELESS_HANDLERS
pnetdev->wireless_handlers = NULL;
/****** init adapter ******/
padapter = rtw_netdev_priv(pnetdev);
memcpy(padapter, primary_padapter, sizeof(_adapter));
- padapter->ph2c_fwcmd_mutex = primary_padapter->ph2c_fwcmd_mutex;
- padapter->psetch_mutex = primary_padapter->psetch_mutex;
- padapter->psetbw_mutex = primary_padapter->psetbw_mutex;
- padapter->hw_init_mutex = primary_padapter->hw_init_mutex;
//
- padapter->bup = false;
- padapter->net_closed = true;
- padapter->hw_init_completed = false;
+ padapter->bup = _FALSE;
+ padapter->net_closed = _TRUE;
+ padapter->hw_init_completed = _FALSE;
//set adapter_type/iface type
- padapter->isprimary = false;
+ padapter->isprimary = _FALSE;
padapter->adapter_type = SECONDARY_ADAPTER;
padapter->pbuddy_adapter = primary_padapter;
+ padapter->iface_id = IFACE_ID1;
#ifndef CONFIG_HWPORT_SWAP //Port0 -> Pri , Port1 -> Sec
padapter->iface_type = IFACE_PORT1;
#else
/****** setup dvobj ******/
pdvobjpriv = adapter_to_dvobj(padapter);
pdvobjpriv->if2 = padapter;
+ pdvobjpriv->padapters[pdvobjpriv->iface_nums++] = padapter;
SET_NETDEV_DEV(pnetdev, dvobj_to_dev(pdvobjpriv));
#ifdef CONFIG_IOCTL_CFG80211
//step init_io_priv
if ((rtw_init_io_priv(padapter, set_intf_ops)) == _FAIL) {
- RT_TRACE(_module_hci_intfs_c_,_drv_err_,("\n Can't init io_reqs\n"));
+ RT_TRACE(_module_hci_intfs_c_,_drv_err_,(" \n Can't init io_reqs\n"));
}
//step read_chip_version
if(rtw_init_drv_sw(padapter)!= _SUCCESS)
goto error_rtw_drv_if2_init;
-
- // alloc dev name after got efuse data.
- if(name == NULL)
- name = padapter->registrypriv.if2name;
-
- rtw_init_netdev_name(pnetdev, name);
//get mac address from primary_padapter
memcpy(mac, primary_padapter->eeprompriv.mac_addr, ETH_ALEN);
}
memcpy(padapter->eeprompriv.mac_addr, mac, ETH_ALEN);
-
- memcpy(pnetdev->dev_addr, mac, ETH_ALEN);
-
- DBG_871X("MAC Address (if2) = "MAC_FMT"\n", MAC_ARG(mac));
+ rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr);
primary_padapter->pbuddy_adapter = padapter;
- //prepare concurrent shared data buffer
- if(!primary_padapter->pcodatapriv)
- {
- struct co_data_priv *pcodatapriv;
-
- pcodatapriv = (struct co_data_priv*)rtw_zvmalloc(sizeof(struct co_data_priv));
-
- primary_padapter->pcodatapriv = pcodatapriv;
- padapter->pcodatapriv = pcodatapriv;
-
- //concurrent shared data init.
- pcodatapriv->co_ch = rtw_channel;
- pcodatapriv->co_bw = HT_CHANNEL_WIDTH_20;
- pcodatapriv->co_ch_offset = HAL_PRIME_CHNL_OFFSET_DONT_CARE;
- }
-
- /* Tell the network stack we exist */
- if (register_netdev(pnetdev) != 0)
- {
- goto error_rtw_drv_if2_init;
- }
+ padapter->dir_dev = NULL;
res = _SUCCESS;
error_rtw_drv_if2_init:
- rtw_free_drv_sw(padapter);
+ if(padapter)
+ rtw_free_drv_sw(padapter);
if (pnetdev)
rtw_free_netdev(pnetdev);
}
-void rtw_drv_if2_free(_adapter *primary_padapter)
+void rtw_drv_if2_free(_adapter *if2)
{
- _adapter *padapter=NULL;
- struct net_device *pnetdev=NULL;
-#ifdef CONFIG_IOCTL_CFG80211
- struct wireless_dev *wdev;
-#endif //CONFIG_IOCTL_CFG80211
-
- if(primary_padapter && primary_padapter->adapter_type == PRIMARY_ADAPTER)
- {
- padapter = primary_padapter->pbuddy_adapter;
- //pnetdev = padapter->pnetdev;
- }
+ _adapter *padapter = if2;
+ struct net_device *pnetdev = NULL;
- if(padapter==NULL)
+ if (padapter == NULL)
return;
pnetdev = padapter->pnetdev;
#ifdef CONFIG_IOCTL_CFG80211
- wdev = padapter->rtw_wdev;
-#endif //CONFIG_IOCTL_CFG80211
+ rtw_wdev_free(padapter->rtw_wdev);
+#endif /* CONFIG_IOCTL_CFG80211 */
- if(pnetdev)
- {
+
+ rtw_free_drv_sw(padapter);
+
+ rtw_free_netdev(pnetdev);
+
+}
+
+void rtw_drv_if2_stop(_adapter *if2)
+{
+ _adapter *padapter = if2;
+ struct net_device *pnetdev = NULL;
+
+ if (padapter == NULL)
+ return;
+
+ pnetdev = padapter->pnetdev;
+
+ if (pnetdev) {
unregister_netdev(pnetdev); //will call netdev_close()
rtw_proc_remove_one(pnetdev);
}
rtw_cancel_all_timer(padapter);
- if(padapter->bup == true)
- {
- padapter->bDriverStopped = true;
+ if (padapter->bup == _TRUE) {
+ padapter->bDriverStopped = _TRUE;
+ #ifdef CONFIG_XMIT_ACK
+ if (padapter->xmitpriv.ack_tx)
+ rtw_ack_tx_done(&padapter->xmitpriv, RTW_SCTX_DONE_DRV_STOP);
+ #endif
if(padapter->intf_stop)
{
rtw_stop_drv_threads(padapter);
- padapter->bup = false;
+ padapter->bup = _FALSE;
}
- primary_padapter->pbuddy_adapter = NULL;
-
- padapter->pcodatapriv = NULL;
-
- rtw_free_drv_sw(padapter);
-
-#ifdef CONFIG_IOCTL_CFG80211
- rtw_wdev_free(wdev);
-#endif //CONFIG_IOCTL_CFG80211
-
- rtw_free_netdev(pnetdev);
-
- //free concurrent shared data buffer
- if(primary_padapter->pcodatapriv)
- {
- rtw_vmfree((u8*)primary_padapter->pcodatapriv, sizeof(struct co_data_priv));
-
- primary_padapter->pcodatapriv = NULL;
- }
+ #ifdef CONFIG_IOCTL_CFG80211
+ rtw_wdev_unregister(padapter->rtw_wdev);
+ #endif
}
#endif //end of CONFIG_CONCURRENT_MODE
rcu_read_lock();
#endif // (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35))
- //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == true)
+ //if(check_fwstate(pmlmepriv, WIFI_STATION_STATE|WIFI_ADHOC_STATE) == _TRUE)
{
//struct net_bridge *br = netdev->br_port->br;//->dev->dev_addr;
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
#endif // (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 35))
{
struct net_device *br_netdev;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
- br_netdev = dev_get_by_name(CONFIG_BR_EXT_BRNAME);
-#else // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
struct net *devnet = NULL;
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
- devnet = netdev->nd_net;
-#else // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
devnet = dev_net(netdev);
-#endif // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,26))
br_netdev = dev_get_by_name(devnet, CONFIG_BR_EXT_BRNAME);
-#endif // (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,24))
if (br_netdev) {
memcpy(adapter->br_mac, br_netdev->dev_addr, ETH_ALEN);
dev_put(br_netdev);
} else
- printk("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
+ DBG_8723A("%s()-%d: dev_get_by_name(%s) failed!", __FUNCTION__, __LINE__, CONFIG_BR_EXT_BRNAME);
}
adapter->ethBrExtInfo.addPPPoETag = 1;
}
#endif //CONFIG_BR_EXT
+static int _rtw_drv_register_netdev(_adapter *padapter, char *name)
+{
+ int ret = _SUCCESS;
+ struct net_device *pnetdev = padapter->pnetdev;
+
+ /* alloc netdev name */
+ rtw_init_netdev_name(pnetdev, name);
+
+ memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN);
+
+ /* Tell the network stack we exist */
+ if (register_netdev(pnetdev) != 0) {
+ DBG_8723A(FUNC_NDEV_FMT "Failed!\n", FUNC_NDEV_ARG(pnetdev));
+ ret = _FAIL;
+ goto error_register_netdev;
+ }
+
+ DBG_8723A("%s, MAC Address (if%d) = " MAC_FMT "\n", __FUNCTION__, (padapter->iface_id+1), MAC_ARG(pnetdev->dev_addr));
+
+ return ret;
+
+error_register_netdev:
+
+ if(padapter->iface_id > IFACE_ID0)
+ {
+ rtw_free_drv_sw(padapter);
+
+ rtw_free_netdev(pnetdev);
+ }
+
+ return ret;
+}
+
+int rtw_drv_register_netdev(_adapter *if1)
+{
+ int i, status = _SUCCESS;
+ struct dvobj_priv *dvobj = if1->dvobj;
+
+ if(dvobj->iface_nums < IFACE_ID_MAX)
+ {
+ for(i=0; i<dvobj->iface_nums; i++)
+ {
+ _adapter *padapter = dvobj->padapters[i];
+
+ if(padapter)
+ {
+ char *name;
+
+ if(padapter->iface_id == IFACE_ID0)
+ name = if1->registrypriv.ifname;
+ else if(padapter->iface_id == IFACE_ID1)
+ name = if1->registrypriv.if2name;
+ else
+ name = "wlan%d";
+
+ if((status = _rtw_drv_register_netdev(padapter, name)) != _SUCCESS) {
+ break;
+ }
+ }
+ }
+ }
+
+ return status;
+}
+
int _netdev_open(struct net_device *pnetdev)
{
uint status;
struct pwrctrl_priv *pwrctrlpriv = &padapter->pwrctrlpriv;
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - dev_open\n"));
- DBG_871X("+871x_drv - drv_open, bup=%d\n", padapter->bup);
+ DBG_8723A("+871x_drv - drv_open, bup=%d\n", padapter->bup);
- if(pwrctrlpriv->ps_flag == true){
- padapter->net_closed = false;
+ if(pwrctrlpriv->ps_flag == _TRUE){
+ padapter->net_closed = _FALSE;
goto netdev_open_normal_process;
}
- if(padapter->bup == false)
+ if(padapter->bup == _FALSE)
{
- padapter->bDriverStopped = false;
- padapter->bSurpriseRemoved = false;
- padapter->bCardDisableWOHSM = false;
+ padapter->bDriverStopped = _FALSE;
+ padapter->bSurpriseRemoved = _FALSE;
+ padapter->bCardDisableWOHSM = _FALSE;
status = rtw_hal_init(padapter);
if (status ==_FAIL)
goto netdev_open_error;
}
- DBG_871X("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
+ DBG_8723A("MAC Address = "MAC_FMT"\n", MAC_ARG(pnetdev->dev_addr));
+
+#ifdef CONFIG_RF_GAIN_OFFSET
+ rtw_bb_rf_gain_offset(padapter);
+#endif //CONFIG_RF_GAIN_OFFSET
status=rtw_start_drv_threads(padapter);
if(status ==_FAIL)
{
- RT_TRACE(_module_os_intfs_c_,_drv_err_,("Initialize driver software resource Failed!\n"));
+ DBG_8723A("Initialize driver software resource Failed!\n");
goto netdev_open_error;
}
if (init_hw_mlme_ext(padapter) == _FAIL)
{
- RT_TRACE(_module_os_intfs_c_,_drv_err_,("can't init mlme_ext_priv\n"));
+ DBG_8723A("can't init mlme_ext_priv\n");
goto netdev_open_error;
}
rtw_led_control(padapter, LED_CTL_NO_LINK);
- padapter->bup = true;
+ padapter->bup = _TRUE;
}
- padapter->net_closed = false;
+ padapter->net_closed = _FALSE;
_set_timer(&padapter->mlmepriv.dynamic_chk_timer, 2000);
- padapter->pwrctrlpriv.bips_processing = false;
+ padapter->pwrctrlpriv.bips_processing = _FALSE;
rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv);
//netif_carrier_on(pnetdev);//call this func when rtw_joinbss_event_callback return success
netdev_br_init(pnetdev);
#endif // CONFIG_BR_EXT
-#ifdef CONFIG_P2P
- init_wifidirect_info( padapter, P2P_ROLE_DISABLE );
- reset_global_wifidirect_info( padapter );
-#ifdef CONFIG_WFD
- if(rtw_init_wifi_display_info(padapter) == _FAIL)
- {
- RT_TRACE(_module_os_intfs_c_,_drv_err_,("\n Can't init init_wifi_display_info\n"));
-
- goto netdev_open_error;
- }
-#endif //CONFIG_WFD
-#endif // CONFIG_P2P
-
netdev_open_normal_process:
#ifdef CONFIG_CONCURRENT_MODE
{
_adapter *sec_adapter = padapter->pbuddy_adapter;
- if(sec_adapter && (sec_adapter->bup == false || sec_adapter->hw_init_completed == false))
+ if(sec_adapter && (sec_adapter->bup == _FALSE || sec_adapter->hw_init_completed == _FALSE))
_netdev_if2_open(sec_adapter->pnetdev);
}
#endif
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - dev_open\n"));
- DBG_871X("-871x_drv - drv_open, bup=%d\n", padapter->bup);
+ DBG_8723A("-871x_drv - drv_open, bup=%d\n", padapter->bup);
return 0;
netdev_open_error:
- padapter->bup = false;
+ padapter->bup = _FALSE;
netif_carrier_off(pnetdev);
rtw_netif_stop_queue(pnetdev);
RT_TRACE(_module_os_intfs_c_,_drv_err_,("-871x_drv - dev_open, fail!\n"));
- DBG_871X("-871x_drv - drv_open fail, bup=%d\n", padapter->bup);
+ DBG_8723A("-871x_drv - drv_open fail, bup=%d\n", padapter->bup);
return (-1);
int ret;
_adapter *padapter = (_adapter *)rtw_netdev_priv(pnetdev);
- _enter_critical_mutex(padapter->hw_init_mutex, NULL);
+ _enter_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
ret = _netdev_open(pnetdev);
- _exit_critical_mutex(padapter->hw_init_mutex, NULL);
+ _exit_critical_mutex(&(adapter_to_dvobj(padapter)->hw_init_mutex), NULL);
return ret;
}
int ips_netdrv_open(_adapter *padapter)
{
int status = _SUCCESS;
- padapter->net_closed = false;
- DBG_871X("===> %s.........\n",__FUNCTION__);
+ padapter->net_closed = _FALSE;
+ DBG_8723A("===> %s.........\n",__FUNCTION__);
- padapter->bDriverStopped = false;
- padapter->bSurpriseRemoved = false;
- padapter->bCardDisableWOHSM = false;
- //padapter->bup = true;
+ padapter->bDriverStopped = _FALSE;
+ padapter->bSurpriseRemoved = _FALSE;
+ padapter->bCardDisableWOHSM = _FALSE;
+ //padapter->bup = _TRUE;
status = rtw_hal_init(padapter);
if (status ==_FAIL)
return _SUCCESS;
netdev_open_error:
- //padapter->bup = false;
- DBG_871X("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup);
+ //padapter->bup = _FALSE;
+ DBG_8723A("-ips_netdrv_open - drv_open failure, bup=%d\n", padapter->bup);
return _FAIL;
}
{
int result;
u32 start_time = rtw_get_current_time();
- DBG_871X("===> rtw_ips_pwr_up..............\n");
+ DBG_8723A("===> rtw_ips_pwr_up..............\n");
rtw_reset_drv_sw(padapter);
result = ips_netdrv_open(padapter);
rtw_led_control(padapter, LED_CTL_NO_LINK);
- DBG_871X("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time));
+ DBG_8723A("<=== rtw_ips_pwr_up.............. in %dms\n", rtw_get_passing_time_ms(start_time));
return result;
}
void rtw_ips_pwr_down(_adapter *padapter)
{
u32 start_time = rtw_get_current_time();
- DBG_871X("===> rtw_ips_pwr_down...................\n");
+ DBG_8723A("===> rtw_ips_pwr_down...................\n");
- padapter->bCardDisableWOHSM = true;
- padapter->net_closed = true;
+ padapter->bCardDisableWOHSM = _TRUE;
+ padapter->net_closed = _TRUE;
rtw_led_control(padapter, LED_CTL_POWER_OFF);
rtw_ips_dev_unload(padapter);
- padapter->bCardDisableWOHSM = false;
- DBG_871X("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
+ padapter->bCardDisableWOHSM = _FALSE;
+ DBG_8723A("<=== rtw_ips_pwr_down..................... in %dms\n", rtw_get_passing_time_ms(start_time));
}
#endif
void rtw_ips_dev_unload(_adapter *padapter)
{
struct net_device *pnetdev= (struct net_device*)padapter->pnetdev;
struct xmit_priv *pxmitpriv = &(padapter->xmitpriv);
- DBG_871X("====> %s...\n",__FUNCTION__);
+ DBG_8723A("====> %s...\n",__FUNCTION__);
rtw_hal_set_hwreg(padapter, HW_VAR_FIFO_CLEARN_UP, 0);
}
//s5.
- if(padapter->bSurpriseRemoved == false)
+ if(padapter->bSurpriseRemoved == _FALSE)
{
rtw_hal_deinit(padapter);
}
}
+#ifdef CONFIG_RF_GAIN_OFFSET
+void rtw_bb_rf_gain_offset(_adapter *padapter)
+{
+ u8 value = padapter->eeprompriv.EEPROMRFGainOffset;
+ u8 tmp = 0x3e;
+ u32 res;
+
+ DBG_8723A("+%s value: 0x%02x+\n", __func__, value);
+
+ if (!(value & 0x01)) {
+ DBG_8723A("Offset RF Gain.\n");
+ res = rtw_hal_read_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, 0xffffffff);
+ value &= tmp;
+ res = value << 14;
+ rtw_hal_write_rfreg(padapter, RF_PATH_A, REG_RF_BB_GAIN_OFFSET, RF_GAIN_OFFSET_MASK, res);
+ } else {
+ DBG_8723A("Using the default RF gain.\n");
+ }
+}
+#endif //CONFIG_RF_GAIN_OFFSET
+
int pm_netdev_open(struct net_device *pnetdev,u8 bnormal)
{
int status;
- if (true == bnormal)
+ if (_TRUE == bnormal)
status = netdev_open(pnetdev);
#ifdef CONFIG_IPS
else
RT_TRACE(_module_os_intfs_c_,_drv_info_,("+871x_drv - drv_close\n"));
- if(padapter->pwrctrlpriv.bInternalAutoSuspend == true)
+ if(padapter->pwrctrlpriv.bInternalAutoSuspend == _TRUE)
{
//rtw_pwr_wakeup(padapter);
if(padapter->pwrctrlpriv.rf_pwrstate == rf_off)
- padapter->pwrctrlpriv.ps_flag = true;
+ padapter->pwrctrlpriv.ps_flag = _TRUE;
}
- padapter->net_closed = true;
+ padapter->net_closed = _TRUE;
/* if(!padapter->hw_init_completed)
{
- DBG_871X("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
+ DBG_8723A("(1)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
- padapter->bDriverStopped = true;
+ padapter->bDriverStopped = _TRUE;
rtw_dev_unload(padapter);
}
else*/
if(padapter->pwrctrlpriv.rf_pwrstate == rf_on){
- DBG_871X("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
+ DBG_8723A("(2)871x_drv - drv_close, bup=%d, hw_init_completed=%d\n", padapter->bup, padapter->hw_init_completed);
//s1.
if(pnetdev)
#ifndef CONFIG_ANDROID
//s2.
- //s2-1. issue rtw_disassoc_cmd to fw
- rtw_disassoc_cmd(padapter);
+ LeaveAllPowerSaveMode(padapter);
+ rtw_disassoc_cmd(padapter, 500, _FALSE);
//s2-2. indicate disconnect to os
rtw_indicate_disconnect(padapter);
//s2-3.
rtw_free_assoc_resources(padapter, 1);
//s2-4.
- rtw_free_network_queue(padapter,true);
+ rtw_free_network_queue(padapter,_TRUE);
#endif
// Close LED
rtw_led_control(padapter, LED_CTL_POWER_OFF);
#ifdef CONFIG_P2P
#ifdef CONFIG_IOCTL_CFG80211
- if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == true)
- wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = false;
+ if(wdev_to_priv(padapter->rtw_wdev)->p2p_enabled == _TRUE)
+ wdev_to_priv(padapter->rtw_wdev)->p2p_enabled = _FALSE;
#endif
rtw_p2p_enable(padapter, P2P_ROLE_DISABLE);
#endif //CONFIG_P2P
#ifdef CONFIG_IOCTL_CFG80211
rtw_scan_abort(padapter);
- wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = false;
+ wdev_to_priv(padapter->rtw_wdev)->bandroid_scan = _FALSE;
padapter->rtw_wdev->iftype = NL80211_IFTYPE_MONITOR; //set this at the end
#endif //CONFIG_IOCTL_CFG80211
-#ifdef CONFIG_WAPI_SUPPORT
- rtw_wapi_disable_tx(padapter);
-#endif
-
RT_TRACE(_module_os_intfs_c_,_drv_info_,("-871x_drv - drv_close\n"));
- DBG_871X("-871x_drv - drv_close, bup=%d\n", padapter->bup);
+ DBG_8723A("-871x_drv - drv_close, bup=%d\n", padapter->bup);
return 0;
}
+
+void rtw_ndev_destructor(struct net_device *ndev)
+{
+ DBG_8723A(FUNC_NDEV_FMT"\n", FUNC_NDEV_ARG(ndev));
+
+#ifdef CONFIG_IOCTL_CFG80211
+ if (ndev->ieee80211_ptr)
+ kfree(ndev->ieee80211_ptr);
+#endif
+ free_netdev(ndev);
+}
OSDN Git Service
