diff --git a/include/autoconf.h b/include/autoconf.h index 99a312b..15b9cea 100644 --- a/include/autoconf.h +++ b/include/autoconf.h @@ -105,7 +105,6 @@ #endif // CONFIG_LED #define USB_INTERFERENCE_ISSUE // this should be checked in all usb interface -#define CONFIG_GLOBAL_UI_PID #define CONFIG_NEW_SIGNAL_STAT_PROCESS #define RTW_NOTCH_FILTER 0 /* 0:Disable, 1:Enable, */ diff --git a/include/rtw_ioctl.h b/include/rtw_ioctl.h index d41bb23..2757140 100644 --- a/include/rtw_ioctl.h +++ b/include/rtw_ioctl.h @@ -133,8 +133,7 @@ extern NDIS_STATUS drv_set_info( u32* BytesRead, u32* BytesNeeded ); -#ifdef CONFIG_GLOBAL_UI_PID + extern int ui_pid[3]; -#endif #endif // #ifndef __INC_CEINFO_ diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 60dafbb..89f5d1a 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -3485,9 +3485,7 @@ static int rtw_set_pid(struct net_device *dev, selector = *pdata; if (selector < 3 && selector >=0) { padapter->pid[selector] = *(pdata+1); - #ifdef CONFIG_GLOBAL_UI_PID ui_pid[selector] = *(pdata+1); - #endif DBG_88E("%s set pid[%d]=%d\n", __func__, selector ,padapter->pid[selector]); } else diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index 0d79b14..53174e3 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -35,10 +35,7 @@ #include #include -#ifdef CONFIG_GLOBAL_UI_PID int ui_pid[3] = {0, 0, 0}; -#endif - static int rtw_suspend(struct usb_interface *intf, pm_message_t message); static int rtw_resume(struct usb_interface *intf); @@ -1379,12 +1376,10 @@ static int rtw_drv_init(struct usb_interface *pusb_intf, const struct usb_device goto free_dvobj; } -#ifdef CONFIG_GLOBAL_UI_PID - if (ui_pid[1]!=0) { + if (ui_pid[1] != 0) { DBG_88E("ui_pid[1]:%d\n",ui_pid[1]); rtw_signal_process(ui_pid[1], SIGUSR2); } -#endif RT_TRACE(_module_hci_intfs_c_,_drv_err_,("-871x_drv - drv_init, success!\n"));