staging: rtl8188eu: Remove function with empty defination ODM_ResetIQKResult()
PATCH 1/26 staging: rtl8188eu: Remove function with empty defination ODM_ResetIQKResult()
--- drivers/staging/rtl8188eu/hal/HalPhyRf.c | 8 -------- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 2 -- drivers/staging/rtl8188eu/include/HalPhyRf.h | 2 -- 3 files changed, 12 deletions(-)
drivers/staging/rtl8188eu/hal/HalPhyRf.c +0 -8
@@ -20,14 +20,6 @@#include "odm_precomp.h" -/* 3============================================================ */ -/* 3 IQ Calibration */ -/* 3============================================================ */ - -void ODM_ResetIQKResult (struct odm_dm_struct *pDM_Odm) -{ -} -u8 ODM_GetRightChnlPlaceforIQK (u8 chnl) {u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G ] = {
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +0 -2
@@ -455,8 +455,6 @@ odm_TXPowerTrackingCallback_ThermalMeter_8188E( }if (delta_IQK >=8 ) {/* Delta temperature is equal to or larger than 20 centigrade. */ -ODM_ResetIQKResult (dm_odm); - dm_odm->RFCalibrateInfo.ThermalValue_IQK = ThermalValue;PHY_IQCalibrate_8188E (Adapter, false); }
drivers/staging/rtl8188eu/include/HalPhyRf.h +0 -2
@@ -23,8 +23,6 @@#define ODM_TARGET_CHNL_NUM_2G_5G 59 -void ODM_ResetIQKResult (struct odm_dm_struct *pDM_Odm); -u8 ODM_GetRightChnlPlaceforIQK (u8 chnl);#endif /* #ifndef __HAL_PHY_RF_H__ */
Signature · 1 line
1.7.10.4
PATCH 2/26 staging :rtl8188eu: Remove HalPhyRf.[h|c] files.
Move ODM_GetRightChnlPlaceforIQK() from HalPhyRf.c to HalPhyRf_8188e.c. Move ODM_TARGET_CHNL_NUM_2G_5G from HalPhyRf.h to HalPhyRf_8188e.h. After the movement of function and macro HalPhyRf.[h|c] files are redundant.
--- drivers/staging/rtl8188eu/Makefile | 1 - drivers/staging/rtl8188eu/hal/HalPhyRf.c | 41 -------------------- drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c | 20 ++++++++++ drivers/staging/rtl8188eu/include/HalPhyRf.h | 28 ------------- drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h | 2 +- drivers/staging/rtl8188eu/include/odm_precomp.h | 1 - 6 files changed, 21 insertions(+), 72 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/hal/HalPhyRf.c delete mode 100644 drivers/staging/rtl8188eu/include/HalPhyRf.h
drivers/staging/rtl8188eu/Makefile +0 -1
@@ -25,7 +25,6 @@ r8188eu-y := \ hal/HalHWImg8188E_MAC.o \ hal/HalHWImg8188E_BB.o \ hal/HalHWImg8188E_RF.o \ - hal/HalPhyRf.o \ hal/HalPhyRf_8188e.o \ hal/HalPwrSeqCmd.o \ hal/Hal8188EPwrSeq.o \
drivers/staging/rtl8188eu/hal/HalPhyRf.c deleted +0 -41
41 lines not on this page · raw message
drivers/staging/rtl8188eu/hal/HalPhyRf_8188e.c +20 -0
@@ -27,6 +27,26 @@/*---------------------------Define Local Constant---------------------------*/ +u8 ODM_GetRightChnlPlaceforIQK (u8 chnl) +{ +u8 channel_all[ODM_TARGET_CHNL_NUM_2G_5G ] = { +1 ,2 ,3 ,4 ,5 ,6 ,7 ,8 ,9 ,10 ,11 ,12 ,13 ,14 , +36 ,38 ,40 ,42 ,44 ,46 ,48 ,50 ,52 ,54 ,56 ,58 ,60 ,62 ,64 , +100 ,102 ,104 ,106 ,108 ,110 ,112 ,114 ,116 ,118 ,120 ,122 , +124 ,126 ,128 ,130 ,132 ,134 ,136 ,138 ,140 ,149 ,151 ,153 , +155 ,157 ,159 ,161 ,163 ,165 + }; +u8 place = chnl; + +if (chnl >14 ) { +for (place =14 ; place <sizeof (channel_all); place++) { +if (channel_all[place] == chnl) +return place-13 ; + } + } +return 0 ; +} +/* 3============================================================ */ /* 3 Tx Power Tracking */ /* 3============================================================ */
drivers/staging/rtl8188eu/include/HalPhyRf.h deleted +0 -28
@@ -1,28 +0,0 @@ -/****************************************************************************** -* -* Copyright(c) 2007 - 2011 Realtek Corporation. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify it -* under the terms of version 2 of the GNU General Public License as -* published by the Free Software Foundation. -* -* This program is distributed in the hope that it will be useful, but WITHOUT -* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -* more details. -* -* You should have received a copy of the GNU General Public License along with -* this program; if not, write to the Free Software Foundation, Inc., -* 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA -* -* -******************************************************************************/ - -#ifndef __HAL_PHY_RF_H__ -#define __HAL_PHY_RF_H__ - -#define ODM_TARGET_CHNL_NUM_2G_5G 59 - -u8 ODM_GetRightChnlPlaceforIQK (u8 chnl); - -#endif /* #ifndef __HAL_PHY_RF_H__ */
drivers/staging/rtl8188eu/include/HalPhyRf_8188e.h +1 -1
@@ -25,7 +25,7 @@#define IQK_DELAY_TIME_88E 10/* ms */ #define index_mapping_NUM_88E 15#define AVG_THERMAL_NUM_88E 4 - +#define ODM_TARGET_CHNL_NUM_2G_5G 59 void ODM_TxPwrTrackAdjust88E(struct odm_dm_struct *pDM_Odm, u8 Type, /* 0 = OFDM, 1 = CCK */
drivers/staging/rtl8188eu/include/odm_precomp.h +0 -1
@@ -39,7 +39,6 @@#include "odm_RegDefine11AC.h" #include "odm_RegDefine11N.h" -#include "HalPhyRf.h" #include "HalPhyRf_8188e.h" /* for IQK,LCK,Power-tracking */ #include "Hal8188ERateAdaptive.h" /* for RA,Power training */ #include "rtl8188e_hal.h"
Signature · 1 line
1.7.10.4
PATCH 3/26 staging: rtl8188eu: Remove header file rtw_version.h
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_debug.c | 1 - drivers/staging/rtl8188eu/include/rtw_debug.h | 2 +- drivers/staging/rtl8188eu/include/rtw_version.h | 1 - drivers/staging/rtl8188eu/os_dep/ioctl_linux.c | 1 - drivers/staging/rtl8188eu/os_dep/os_intfs.c | 1 - drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 - 6 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 drivers/staging/rtl8188eu/include/rtw_version.h
drivers/staging/rtl8188eu/core/rtw_debug.c +0 -1
@@ -20,7 +20,6 @@#define _RTW_DEBUG_C_#include <rtw_debug.h> -#include <rtw_version.h> int proc_get_drv_version(char *page, char **start, off_t offset, int count,
drivers/staging/rtl8188eu/include/rtw_debug.h +1 -1
@@ -23,7 +23,7 @@#include <osdep_service.h> #include <drv_types.h> - +#define DRIVERVERSION "v4.1.4_6773.20130222"#define _drv_always_ 1#define _drv_emerg_ 2#define _drv_alert_ 3
drivers/staging/rtl8188eu/include/rtw_version.h deleted +0 -1
@@ -1 +0,0 @@ -#define DRIVERVERSION "v4.1.4_6773.20130222"
drivers/staging/rtl8188eu/os_dep/ioctl_linux.c +0 -1
@@ -30,7 +30,6 @@#include <rtw_ioctl_set.h> #include <rtw_mp_ioctl.h> #include <usb_ops.h> -#include <rtw_version.h> #include <rtl8188e_hal.h> #include <rtw_mp.h>
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -1
@@ -25,7 +25,6 @@#include <recv_osdep.h> #include <hal_intf.h> #include <rtw_ioctl.h> -#include <rtw_version.h> #include <usb_osintf.h> #include <usb_hal.h>
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -1
@@ -24,7 +24,6 @@#include <recv_osdep.h> #include <xmit_osdep.h> #include <hal_intf.h> -#include <rtw_version.h> #include <linux/usb.h> #include <linux/vmalloc.h> #include <osdep_intf.h>
Signature · 1 line
1.7.10.4
PATCH 4/26 staging: rtl8188eu: Remove hw_init_mutex from struct rtw_usb_drv
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 2 +- drivers/staging/rtl8188eu/os_dep/os_intfs.c | 6 ++++-- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 6 +----- 3 files changed, 6 insertions(+), 8 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +1 -1
@@ -307,7 +307,7 @@ struct adapter {#endif struct adapter *pbuddy_adapter; -struct mutex *hw_init_mutex; +struct mutex hw_init_mutex;spinlock_t br_ext_lock;struct nat25_network_db_entry *nethash[NAT25_HASH_SIZE ];
drivers/staging/rtl8188eu/os_dep/os_intfs.c +4 -2
@@ -997,6 +997,8 @@ u8 rtw_free_drv_sw(struct adapter *padapter)if (padapter->pbuddy_adapter !=NULL ) padapter->pbuddy_adapter->pbuddy_adapter =NULL ; +mutex_destroy (&padapter->hw_init_mutex); +RT_TRACE (_module_os_intfs_c_, _drv_info_, ("-rtw_free_drv_sw\n" ));return _SUCCESS;
@@ -1105,9 +1107,9 @@ int netdev_open(struct net_device *pnetdev)int ret;struct adapter *padapter = (struct adapter *)rtw_netdev_priv (pnetdev); -_enter_critical_mutex (padapter->hw_init_mutex,NULL ); +_enter_critical_mutex (&padapter->hw_init_mutex,NULL ); ret =_netdev_open (pnetdev); -mutex_unlock (padapter->hw_init_mutex); +mutex_unlock (&padapter->hw_init_mutex);return ret; }
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -5
@@ -63,7 +63,6 @@ MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);struct rtw_usb_drv {struct usb_driver usbdrv;int drv_registered; -struct mutex hw_init_mutex; };static struct rtw_usb_drv rtl8188e_usb_drv = {
@@ -537,7 +536,7 @@ static struct adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, dvobj->if1 = padapter; padapter->bDriverStopped = true; - padapter->hw_init_mutex = &usb_drv->hw_init_mutex; +mutex_init (&padapter->hw_init_mutex); padapter->chip_type =RTL8188E ; pnetdev =rtw_init_netdev (padapter);
@@ -732,8 +731,6 @@ static int __init rtw_drv_entry(void)DBG_88E (DRV_NAME " driver version=%s\n" ,DRIVERVERSION ); -mutex_init (&usb_drv->hw_init_mutex); - usb_drv->drv_registered = true;return usb_register (&usb_drv->usbdrv); }
@@ -746,7 +743,6 @@ static void __exit rtw_drv_halt(void) usb_drv->drv_registered = false;usb_deregister (&usb_drv->usbdrv); -mutex_destroy (&usb_drv->hw_init_mutex);DBG_88E ("-rtw_drv_halt\n" ); }
Signature · 1 line
1.7.10.4
PATCH 5/26 staging: rtl8188eu: Use unregistering flag from struct usb_interface
In reply to navin patidarUse unregistering flag from struct usb_interface to find driver registration status.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -1
@@ -707,7 +707,7 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)DBG_88E ("+rtw_dev_remove\n" );RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+dev_remove()\n" )); -if (usb_drv->drv_registered) +if (!pusb_intf->unregistering) padapter->bSurpriseRemoved = true;rtw_pm_set_ips (padapter,IPS_NONE );
Signature · 1 line
1.7.10.4
PATCH 6/26 staging : rtl8188eu: Remove drv_registered from struct rtw_usb_drv
In reply to navin patidar--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 3 --- 1 file changed, 3 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -3
@@ -62,7 +62,6 @@ MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);struct rtw_usb_drv {struct usb_driver usbdrv; -int drv_registered; };static struct rtw_usb_drv rtl8188e_usb_drv = {
@@ -731,7 +730,6 @@ static int __init rtw_drv_entry(void)DBG_88E (DRV_NAME " driver version=%s\n" ,DRIVERVERSION ); - usb_drv->drv_registered = true;return usb_register (&usb_drv->usbdrv); }
@@ -740,7 +738,6 @@ static void __exit rtw_drv_halt(void)RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_halt\n" ));DBG_88E ("+rtw_drv_halt\n" ); - usb_drv->drv_registered = false;usb_deregister (&usb_drv->usbdrv);DBG_88E ("-rtw_drv_halt\n" );
Signature · 1 line
1.7.10.4
PATCH 7/26 staging: rtl8188eu: Remove struct rtw_usb_drv
In reply to navin patidarstruct rtw_usb_drv contains only one member usb_driver structure, so no use of keeping it.
--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +10 -16
@@ -60,22 +60,16 @@ static struct usb_device_id rtw_usb_id_tbl[] = {MODULE_DEVICE_TABLE (usb, rtw_usb_id_tbl); -struct rtw_usb_drv { -struct usb_driver usbdrv; +static struct usb_driver rtl8188e_usb_drv = { + .name ="r8188eu" , + .probe = rtw_drv_init, + .disconnect = rtw_dev_remove, + .id_table = rtw_usb_id_tbl, + .suspend = rtw_suspend, + .resume = rtw_resume, + .reset_resume = rtw_resume, }; -static struct rtw_usb_drv rtl8188e_usb_drv = { - .usbdrv.name ="r8188eu" , - .usbdrv.probe = rtw_drv_init, - .usbdrv.disconnect = rtw_dev_remove, - .usbdrv.id_table = rtw_usb_id_tbl, - .usbdrv.suspend = rtw_suspend, - .usbdrv.resume = rtw_resume, - .usbdrv.reset_resume = rtw_resume, -}; - -static struct rtw_usb_drv *usb_drv = &rtl8188e_usb_drv; -static u8 rtw_init_intf_priv (struct dvobj_priv *dvobj) {u8 rst = _SUCCESS;
@@ -730,7 +724,7 @@ static int __init rtw_drv_entry(void)DBG_88E (DRV_NAME " driver version=%s\n" ,DRIVERVERSION ); -return usb_register (&usb_drv->usbdrv); +return usb_register (&rtl8188e_usb_drv); } static void __exit rtw_drv_halt(void)
@@ -738,7 +732,7 @@ static void __exit rtw_drv_halt(void)RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_halt\n" ));DBG_88E ("+rtw_drv_halt\n" ); -usb_deregister (&usb_drv->usbdrv); +usb_deregister (&rtl8188e_usb_drv);DBG_88E ("-rtw_drv_halt\n" ); }
Signature · 1 line
1.7.10.4
PATCH 8/26 staging: rtl8188eu: Use module_usb_driver() macro
In reply to navin patidar--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 22 +--------------------- 1 file changed, 1 insertion(+), 21 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +1 -21
@@ -718,24 +718,4 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)return ; } -static int __init rtw_drv_entry (void ) -{ -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_entry\n" )); - -DBG_88E (DRV_NAME " driver version=%s\n" ,DRIVERVERSION ); - -return usb_register (&rtl8188e_usb_drv); -} - -static void __exit rtw_drv_halt(void) -{ -RT_TRACE (_module_hci_intfs_c_, _drv_err_, ("+rtw_drv_halt\n" )); -DBG_88E ("+rtw_drv_halt\n" ); - -usb_deregister (&rtl8188e_usb_drv); - -DBG_88E ("-rtw_drv_halt\n" ); -} - -module_init (rtw_drv_entry); -module_exit (rtw_drv_halt); +module_usb_driver (rtl8188e_usb_drv)
Signature · 1 line
1.7.10.4
PATCH 9/26 staging: rtl8188eu: Remove function declarations in usb_intf.c
In reply to navin patidar--- drivers/staging/rtl8188eu/os_dep/usb_intf.c | 28 ++++++++++----------------- 1 file changed, 10 insertions(+), 18 deletions(-)
drivers/staging/rtl8188eu/os_dep/usb_intf.c +10 -18
@@ -35,14 +35,6 @@int ui_pid[3 ] = {0 ,0 ,0 }; -static int rtw_suspend (struct usb_interface *intf,pm_message_t message); -static int rtw_resume (struct usb_interface *intf); - - -static int rtw_drv_init (struct usb_interface *pusb_intf,const struct usb_device_id *pdid); -static void rtw_dev_remove (struct usb_interface *pusb_intf); - -#define USB_VENDER_ID_REALTEK 0x0bda/* DID_USB_v916_20130116 */
@@ -60,16 +52,6 @@ static struct usb_device_id rtw_usb_id_tbl[] = {MODULE_DEVICE_TABLE (usb, rtw_usb_id_tbl); -static struct usb_driver rtl8188e_usb_drv = { - .name ="r8188eu" , - .probe = rtw_drv_init, - .disconnect = rtw_dev_remove, - .id_table = rtw_usb_id_tbl, - .suspend = rtw_suspend, - .resume = rtw_resume, - .reset_resume = rtw_resume, -}; -static u8 rtw_init_intf_priv (struct dvobj_priv *dvobj) {u8 rst = _SUCCESS;
@@ -718,4 +700,14 @@ static void rtw_dev_remove(struct usb_interface *pusb_intf)return ; } +static struct usb_driver rtl8188e_usb_drv = { + .name ="r8188eu" , + .probe = rtw_drv_init, + .disconnect = rtw_dev_remove, + .id_table = rtw_usb_id_tbl, + .suspend = rtw_suspend, + .resume = rtw_resume, + .reset_resume = rtw_resume, +}; +module_usb_driver (rtl8188e_usb_drv)
Signature · 1 line
1.7.10.4
PATCH 10/26 staging: rtl8188eu: Remove unused stucture defination struct specific_device_id
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -6
@@ -68,12 +68,6 @@ enum _NIC_VERSION {#define SPEC_DEV_ID_RF_CONFIG_2T2R BIT(4)#define SPEC_DEV_ID_ASSIGN_IFNAME BIT(5) -struct specific_device_id { -u32 flags; -u16 idVendor; -u16 idProduct; -}; -struct registry_priv {u8 chip_version;u8 rfintfs;
Signature · 1 line
1.7.10.4
PATCH 11/26 staging: rtl8188eu: Remove unused enum
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 7 ------- 1 file changed, 7 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -7
@@ -54,13 +54,6 @@#include <rtw_mp.h> #include <rtw_br_ext.h> -enum _NIC_VERSION { -RTL8711_NIC , -RTL8712_NIC , -RTL8713_NIC , -RTL8716_NIC -}; -#define SPEC_DEV_ID_NONE BIT(0)#define SPEC_DEV_ID_DISABLE_HT BIT(1)#define SPEC_DEV_ID_ENABLE_PS BIT(2)
Signature · 1 line
1.7.10.4
PATCH 12/26 staging: rtl8188eu: Remove unused members of struct dvobj_priv
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 4 ---- 1 file changed, 4 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -4
@@ -152,7 +152,6 @@ struct rt_firmware {struct dvobj_priv {struct adapter *if1; -struct adapter *if2;struct rt_firmware firmware;/* For 92D, DMDP have 2 interface. */
@@ -164,8 +163,6 @@ struct dvobj_priv {int RtOutPipe[3 ];u8 Queue2Pipe[HW_QUEUE_ENTRY ];/* for out pipe mapping */ -u8 irq_alloc; -/*-------- below is for USB INTERFACE --------*/ u8 nr_endpoint;
@@ -173,7 +170,6 @@ struct dvobj_priv {u8 RtNumInPipes;u8 RtNumOutPipes;int ep_num[5 ];/* endpoint number */ -int RegUsbSS;struct semaphore usb_suspend_sema;struct mutex usb_vendor_req_mutex;
Signature · 1 line
1.7.10.4
PATCH 13/26 staging: rtl8188eu: Remove usb_suspend_sema from struct dvobj_priv
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/os_dep/usb_intf.c | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -170,7 +170,6 @@ struct dvobj_priv {u8 RtNumInPipes;u8 RtNumOutPipes;int ep_num[5 ];/* endpoint number */ -struct semaphore usb_suspend_sema;struct mutex usb_vendor_req_mutex;u8 *usb_alloc_vendor_req_buf;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +0 -1
@@ -144,7 +144,6 @@ static struct dvobj_priv *usb_dvobj_init(struct usb_interface *usb_intf)if (rtw_init_intf_priv (pdvobjpriv) == _FAIL) goto free_dvobj; -sema_init (&(pdvobjpriv->usb_suspend_sema),0 );rtw_reset_continual_urb_error (pdvobjpriv);usb_get_dev (pusbd);
Signature · 1 line
1.7.10.4
PATCH 14/26 staging: rtl8188eu: Remove usb_alloc_vendor_req_buf from struct dvobj_priv
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/os_dep/usb_intf.c | 17 +++++------------ 2 files changed, 5 insertions(+), 13 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -172,7 +172,6 @@ struct dvobj_priv {int ep_num[5 ];/* endpoint number */ struct mutex usb_vendor_req_mutex; -u8 *usb_alloc_vendor_req_buf;u8 *usb_vendor_req_buf;struct usb_interface *pusbintf;
drivers/staging/rtl8188eu/os_dep/usb_intf.c +5 -12
@@ -54,26 +54,19 @@ MODULE_DEVICE_TABLE(usb, rtw_usb_id_tbl);static u8 rtw_init_intf_priv (struct dvobj_priv *dvobj) { -u8 rst = _SUCCESS; -mutex_init (&dvobj->usb_vendor_req_mutex); + dvobj->usb_vendor_req_buf =rtw_zmalloc (MAX_USB_IO_CTL_SIZE ); +if (!dvobj->usb_vendor_req_buf) +return _FAIL; - dvobj->usb_alloc_vendor_req_buf =rtw_zmalloc (MAX_USB_IO_CTL_SIZE ); -if (dvobj->usb_alloc_vendor_req_buf ==NULL ) { -DBG_88E ("alloc usb_vendor_req_buf failed...\n" ); - rst = _FAIL; - goto exit; - } - dvobj->usb_vendor_req_buf = (u8 *)N_BYTE_ALIGMENT ((size_t )(dvobj->usb_alloc_vendor_req_buf),ALIGNMENT_UNIT ); -exit: -return rst; +return _SUCCESS; }static u8 rtw_deinit_intf_priv (struct dvobj_priv *dvobj) {u8 rst = _SUCCESS; -kfree (dvobj->usb_alloc_vendor_req_buf); +kfree (dvobj->usb_vendor_req_buf);mutex_destroy (&dvobj->usb_vendor_req_mutex);return rst; }
Signature · 1 line
1.7.10.4
PATCH 15/26 staging: rtl8188eu: Remove unused enum _ADAPTER_TYPE
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -6
@@ -193,12 +193,6 @@ enum _IFACE_TYPE { MAX_IFACE_PORT, }; -enum _ADAPTER_TYPE { -PRIMARY_ADAPTER , -SECONDARY_ADAPTER , -MAX_ADAPTER , -}; -enum driver_state {DRIVER_NORMAL =0 ,DRIVER_DISAPPEAR =1 ,
Signature · 1 line
1.7.10.4
PATCH 16/26 staging: rtl8188eu: Remove unused enum _IFACE_TYPE
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 6 ------ 1 file changed, 6 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -6
@@ -187,12 +187,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)return &dvobj->pusbintf->dev; }; -enum _IFACE_TYPE { -IFACE_PORT0 ,/* mapping to port0 for C/D series chips */ -IFACE_PORT1 ,/* mapping to port1 for C/D series chip */ -MAX_IFACE_PORT , -}; -enum driver_state {DRIVER_NORMAL =0 ,DRIVER_DISAPPEAR =1 ,
Signature · 1 line
1.7.10.4
PATCH 17/26 staging: rtl8188eu: Remove enum driver_state
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 6 ------ drivers/staging/rtl8188eu/os_dep/usb_intf.c | 10 ++++------ 2 files changed, 4 insertions(+), 12 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -6
@@ -187,12 +187,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)return &dvobj->pusbintf->dev; }; -enum driver_state { -DRIVER_NORMAL =0 , -DRIVER_DISAPPEAR =1 , -DRIVER_REPLACE_DONGLE =2 , -}; -struct adapter {int DriverState;/* for disable driver using module, use dongle toi * replace module. */
drivers/staging/rtl8188eu/os_dep/usb_intf.c +4 -6
@@ -606,12 +606,10 @@ static void rtw_usb_if1_deinit(struct adapter *if1)free_mlme_ap_info (if1);#endif -if (if1->DriverState !=DRIVER_DISAPPEAR ) { -if (pnetdev) { -/* will call netdev_close() */ -unregister_netdev (pnetdev); -rtw_proc_remove_one (pnetdev); - } +if (pnetdev) { +/* will call netdev_close() */ +unregister_netdev (pnetdev); +rtw_proc_remove_one (pnetdev); }rtw_cancel_all_timer (if1);
Signature · 1 line
1.7.10.4
PATCH 18/26 staging: rtl8188eu: Remove DriverState from struct adapter
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 2 -- 1 file changed, 2 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -2
@@ -188,8 +188,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj) };struct adapter { -int DriverState;/* for disable driver using module, use dongle toi -* replace module. */ int pid[3 ];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */ int bDongle;/* build-in module or external dongle */ u16 chip_type;
Signature · 1 line
1.7.10.4
PATCH 19/26 staging: rtl8188eu: Remove unused function rtl8188e_clone_haldata()
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c | 5 ----- drivers/staging/rtl8188eu/include/rtl8188e_hal.h | 1 - 2 files changed, 6 deletions(-)
drivers/staging/rtl8188eu/hal/rtl8188e_hal_init.c +0 -5
@@ -1815,11 +1815,6 @@ static void rtl8188e_SetHalODMVar(struct adapter *Adapter, enum hal_odm_variable } } -void rtl8188e_clone_haldata (struct adapter *dst_adapter,struct adapter *src_adapter) -{ -memcpy (dst_adapter->HalData, src_adapter->HalData, dst_adapter->hal_data_sz); -} -void rtl8188e_start_thread (struct adapter *padapter) { }
drivers/staging/rtl8188eu/include/rtl8188e_hal.h +0 -1
@@ -463,7 +463,6 @@ void rtl8188e_set_hal_ops(struct hal_ops *pHalFunc);/* register */ void SetBcnCtrlReg (struct adapter *padapter,u8 SetBits,u8 ClearBits); -void rtl8188e_clone_haldata (struct adapter *dst,struct adapter *src);void rtl8188e_start_thread (struct adapter *padapter);void rtl8188e_stop_thread (struct adapter *padapter);
Signature · 1 line
1.7.10.4
PATCH 20/26 staging: rtl8188eu: Remove hal_data_sz from struct adapter
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 1 - drivers/staging/rtl8188eu/include/drv_types.h | 1 - 2 files changed, 2 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -1
@@ -2234,7 +2234,6 @@ void rtl8188eu_set_hal_ops(struct adapter *adapt) adapt->HalData =rtw_zmalloc (sizeof (struct hal_data_8188e ));if (adapt->HalData ==NULL )DBG_88E ("cant not alloc memory for HAL DATA\n" ); - adapt->hal_data_sz =sizeof (struct hal_data_8188e ); halfunc->hal_power_on = rtl8188eu_InitPowerOn; halfunc->hal_init = &rtl8188eu_hal_init;
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -215,7 +215,6 @@ struct adapter {struct wifidirect_info wdinfo;void *HalData; -u32 hal_data_sz;struct hal_ops HalFunc;s32 bDriverStopped;
Signature · 1 line
1.7.10.4
PATCH 21/26 staging: rtl8188eu: Remove unused member variable of struct adapter
In reply to navin patidar--- drivers/staging/rtl8188eu/include/drv_types.h | 10 ---------- 1 file changed, 10 deletions(-)
drivers/staging/rtl8188eu/include/drv_types.h +0 -10
@@ -189,7 +189,6 @@ static inline struct device *dvobj_to_dev(struct dvobj_priv *dvobj)struct adapter {int pid[3 ];/* process id from UI, 0:wps, 1:hostapd, 2:dhcpcd */ -int bDongle;/* build-in module or external dongle */ u16 chip_type;struct dvobj_priv *dvobj;
@@ -221,19 +220,11 @@ struct adapter {s32 bSurpriseRemoved;s32 bCardDisableWOHSM; -u32 IsrContent; -u32 ImrContent; -u8 EepromAddressSize;u8 hw_init_completed; -u8 bDriverIsGoingToUnload; -u8 init_adpt_in_progress; -u8 bHaltInProgress;void *cmdThread;void *evtThread; -void *xmitThread; -void *recvThread;void (*intf_start)(struct adapter *adapter);void (*intf_stop)(struct adapter *adapter);struct net_device *pnetdev;
@@ -253,7 +244,6 @@ struct adapter {int net_closed;u8 bFWReady; -u8 bBTFWReady;u8 bReadPortCancel;u8 bWritePortCancel;u8 bRxRSSIDisplay;
Signature · 1 line
1.7.10.4
PATCH 22/26 staging: rtl8188eu:Remove EepromAddressSize from struct adapter
In reply to navin patidar--- drivers/staging/rtl8188eu/hal/usb_halinit.c | 3 --- drivers/staging/rtl8188eu/include/drv_types.h | 1 - 2 files changed, 4 deletions(-)
drivers/staging/rtl8188eu/hal/usb_halinit.c +0 -3
@@ -1203,9 +1203,6 @@ static int _ReadAdapterInfo8188EU(struct adapter *Adapter)static void ReadAdapterInfo8188EU (struct adapter *Adapter) { -/* Read EEPROM size before call any EEPROM function */ - Adapter->EepromAddressSize =GetEEPROMSize8188E (Adapter); -_ReadAdapterInfo8188EU (Adapter); }
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -220,7 +220,6 @@ struct adapter {s32 bSurpriseRemoved;s32 bCardDisableWOHSM; -u8 EepromAddressSize;u8 hw_init_completed;void *cmdThread;
Signature · 1 line
1.7.10.4
PATCH 23/26 staging: rtl8188eu: Remove pbuddy_adapter from struct adapter
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 19 ------------------- drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 ---- 3 files changed, 24 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +0 -19
@@ -114,7 +114,6 @@ int ips_leave(struct adapter *padapter)static bool rtw_pwr_unassociated_idle (struct adapter *adapter) { -struct adapter *buddy = adapter->pbuddy_adapter;struct mlme_priv *pmlmepriv = &(adapter->mlmepriv);#ifdef CONFIG_88EU_P2P struct wifidirect_info *pwdinfo = &(adapter->wdinfo);
@@ -136,24 +135,6 @@ static bool rtw_pwr_unassociated_idle(struct adapter *adapter)#endif goto exit; -/* consider buddy, if exist */ -if (buddy) { -struct mlme_priv *b_pmlmepriv = &(buddy->mlmepriv); -#ifdef CONFIG_88EU_P2P -struct wifidirect_info *b_pwdinfo = &(buddy->wdinfo); -#endif - -if (check_fwstate (b_pmlmepriv,WIFI_ASOC_STATE |WIFI_SITE_MONITOR ) || -check_fwstate (b_pmlmepriv,WIFI_UNDER_LINKING |WIFI_UNDER_WPS ) || -check_fwstate (b_pmlmepriv,WIFI_AP_STATE ) || -check_fwstate (b_pmlmepriv,WIFI_ADHOC_MASTER_STATE |WIFI_ADHOC_STATE ) || -#if defined(CONFIG_88EU_P2P) - !rtw_p2p_chk_state(b_pwdinfo, P2P_STATE_NONE)) -#else - 0) -#endif - goto exit; - } ret = true; exit:
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -254,7 +254,6 @@ struct adapter {* upper application reads it. */ u8 bShowGetP2PState;#endif -struct adapter *pbuddy_adapter;struct mutex hw_init_mutex;
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -4
@@ -993,10 +993,6 @@ u8 rtw_free_drv_sw(struct adapter *padapter) padapter->rereg_nd_name_priv.old_pnetdev =NULL ; } -/* clear pbuddystruct adapter to avoid access wrong pointer. */ -if (padapter->pbuddy_adapter !=NULL ) - padapter->pbuddy_adapter->pbuddy_adapter =NULL ; -mutex_destroy (&padapter->hw_init_mutex);RT_TRACE (_module_os_intfs_c_, _drv_info_, ("-rtw_free_drv_sw\n" ));
Signature · 1 line
1.7.10.4
PATCH 24/26 staging: rtl8188eu: Remove bCardDisableWOHSM from struct adapter
In reply to navin patidardriver doesn't use value stored in bCardDisableWOHSM.
--- drivers/staging/rtl8188eu/core/rtw_pwrctrl.c | 1 - drivers/staging/rtl8188eu/include/drv_types.h | 1 - drivers/staging/rtl8188eu/os_dep/os_intfs.c | 4 ---- 3 files changed, 6 deletions(-)
drivers/staging/rtl8188eu/core/rtw_pwrctrl.c +0 -1
@@ -160,7 +160,6 @@ void rtw_ps_processor(struct adapter *padapter)if (rfpwrstate == rf_off) { pwrpriv->change_rfpwrstate = rf_off; pwrpriv->brfoffbyhw = true; - padapter->bCardDisableWOHSM = true;rtw_hw_suspend (padapter); }else { pwrpriv->change_rfpwrstate = rf_on;
drivers/staging/rtl8188eu/include/drv_types.h +0 -1
@@ -218,7 +218,6 @@ struct adapter {s32 bDriverStopped;s32 bSurpriseRemoved; -s32 bCardDisableWOHSM;u8 hw_init_completed;
drivers/staging/rtl8188eu/os_dep/os_intfs.c +0 -4
@@ -1042,7 +1042,6 @@ int _netdev_open(struct net_device *pnetdev)if (!padapter->bup) { padapter->bDriverStopped = false; padapter->bSurpriseRemoved = false; - padapter->bCardDisableWOHSM = false; status =rtw_hal_init (padapter);if (status == _FAIL) {
@@ -1117,7 +1116,6 @@ static int ips_netdrv_open(struct adapter *padapter) padapter->bDriverStopped = false; padapter->bSurpriseRemoved = false; - padapter->bCardDisableWOHSM = false; status =rtw_hal_init (padapter);if (status == _FAIL) {
@@ -1160,13 +1158,11 @@ void rtw_ips_pwr_down(struct adapter *padapter)u32 start_time = jiffies;DBG_88E ("===> rtw_ips_pwr_down...................\n" ); - padapter->bCardDisableWOHSM = true; padapter->net_closed = true;rtw_led_control (padapter,LED_CTL_POWER_OFF );rtw_ips_dev_unload (padapter); - padapter->bCardDisableWOHSM = false;DBG_88E ("<=== rtw_ips_pwr_down..................... in %dms\n" ,rtw_get_passing_time_ms (start_time)); }
Signature · 1 line
1.7.10.4
PATCH 25/26 staging: rtl8188eu: Remove unused function nat25_handle_frame()
In reply to navin patidar--- drivers/staging/rtl8188eu/Makefile | 32 ++++++------- drivers/staging/rtl8188eu/core/rtw_br_ext.c | 61 ------------------------ drivers/staging/rtl8188eu/include/recv_osdep.h | 1 - 3 files changed, 16 insertions(+), 78 deletions(-)
drivers/staging/rtl8188eu/Makefile +16 -16
@@ -1,4 +1,19 @@ r8188eu-y := \ + hal/rtl8188e_xmit.o \ + hal/rtl8188eu_led.o \ + hal/rtl8188eu_recv.o \ + hal/rtl8188eu_xmit.o \ + hal/usb_halinit.o \ + hal/usb_ops_linux.o \ + os_dep/ioctl_linux.o \ + os_dep/mlme_linux.o \ + os_dep/os_intfs.o \ + os_dep/osdep_service.o \ + os_dep/recv_linux.o \ + os_dep/rtw_android.o \ + os_dep/usb_intf.o \ + os_dep/usb_ops_linux.o \ + os_dep/xmit_linux.o \ core/rtw_ap.o \ core/rtw_br_ext.o \ core/rtw_cmd.o \
@@ -42,22 +57,7 @@ r8188eu-y := \ hal/rtl8188e_mp.o \ hal/rtl8188e_phycfg.o \ hal/rtl8188e_rf6052.o \ - hal/rtl8188e_rxdesc.o \ - hal/rtl8188e_xmit.o \ - hal/rtl8188eu_led.o \ - hal/rtl8188eu_recv.o \ - hal/rtl8188eu_xmit.o \ - hal/usb_halinit.o \ - hal/usb_ops_linux.o \ - os_dep/ioctl_linux.o \ - os_dep/mlme_linux.o \ - os_dep/os_intfs.o \ - os_dep/osdep_service.o \ - os_dep/recv_linux.o \ - os_dep/rtw_android.o \ - os_dep/usb_intf.o \ - os_dep/usb_ops_linux.o \ - os_dep/xmit_linux.o + hal/rtl8188e_rxdesc.o obj-$(CONFIG_R8188EU) := r8188eu.o
drivers/staging/rtl8188eu/core/rtw_br_ext.c +0 -61
67 lines not on this page · raw message
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
@@ -46,7 +46,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);void rtw_os_read_port (struct adapter *padapter,struct recv_buf *precvbuf);void rtw_init_recv_timer (struct recv_reorder_ctrl *preorder_ctrl); -int nat25_handle_frame (struct adapter *priv,struct sk_buff *skb);int _netdev_open (struct net_device *pnetdev);int netdev_open (struct net_device *pnetdev);int netdev_close (struct net_device *pnetdev);
Signature · 1 line
1.7.10.4
PATCH v2 25/26 staging: rtl8188eu: Remove unused function nat25_handle_frame()
---
V2:
Restore sequence of source code compilation, sequence was changed by v1 of this patch.
drivers/staging/rtl8188eu/core/rtw_br_ext.c | 61 ------------------------ drivers/staging/rtl8188eu/include/recv_osdep.h | 1 - 2 files changed, 62 deletions(-)
drivers/staging/rtl8188eu/core/rtw_br_ext.c +0 -61
@@ -1030,67 +1030,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)return -1 ; } -int nat25_handle_frame (struct adapter *priv,struct sk_buff *skb) -{ -if (!(skb->data[0 ] &1 )) { -int is_vlan_tag =0 , i, retval =0 ; -unsigned short vlan_hdr =0 ; -unsigned short protocol; - - protocol =be16_to_cpu (*((__be16 *)(skb->data +2 *ETH_ALEN ))); -if (protocol ==ETH_P_8021Q ) { - is_vlan_tag =1 ; - vlan_hdr = *((unsigned short *)(skb->data+ETH_ALEN *2 +2 )); -for (i =0 ; i <6 ; i++) - *((unsigned short *)(skb->data+ETH_ALEN *2 +2 -i*2 )) = *((unsigned short *)(skb->data+ETH_ALEN *2 -2 -i*2 )); -skb_pull (skb,4 ); - } - -if (!priv->ethBrExtInfo.nat25_disable) { -spin_lock_bh (&priv->br_ext_lock); -/* -* This function look up the destination network address from -* the NAT2.5 database. Return value = -1 means that the -* corresponding network protocol is NOT support. -*/ -if (!priv->ethBrExtInfo.nat25sc_disable && - (be16_to_cpu (*((__be16 *)(skb->data+ETH_ALEN *2 ))) ==ETH_P_IP ) && - !memcmp (priv->scdb_ip, skb->data+ETH_HLEN +16 ,4 )) { -memcpy (skb->data, priv->scdb_mac,ETH_ALEN ); - -spin_unlock_bh (&priv->br_ext_lock); - }else { -spin_unlock_bh (&priv->br_ext_lock); - - retval =nat25_db_handle (priv, skb,NAT25_LOOKUP ); - } - }else { -if (((be16_to_cpu (*((__be16 *)(skb->data+ETH_ALEN *2 ))) ==ETH_P_IP ) && - !memcmp (priv->br_ip, skb->data+ETH_HLEN +16 ,4 )) || - ((be16_to_cpu (*((__be16 *)(skb->data+ETH_ALEN *2 ))) ==ETH_P_ARP ) && - !memcmp (priv->br_ip, skb->data+ETH_HLEN +24 ,4 ))) { -/* for traffic to upper TCP/IP */ - retval =nat25_db_handle (priv, skb,NAT25_LOOKUP ); - } - } - -if (is_vlan_tag) { -skb_push (skb,4 ); -for (i =0 ; i <6 ; i++) - *((unsigned short *)(skb->data+i*2 )) = *((unsigned short *)(skb->data+4 +i*2 )); - *((__be16 *)(skb->data+ETH_ALEN *2 )) =__constant_htons (ETH_P_8021Q ); - *((unsigned short *)(skb->data+ETH_ALEN *2 +2 )) = vlan_hdr; - } - -if (retval ==-1 ) { -/* DEBUG_ERR("NAT25: Lookup fail!\n"); */ -return -1 ; - } - } - -return 0 ; -} -#define SERVER_PORT 67#define CLIENT_PORT 68#define DHCP_MAGIC 0x63825363
drivers/staging/rtl8188eu/include/recv_osdep.h +0 -1
@@ -46,7 +46,6 @@ int rtw_os_recvbuf_resource_alloc(struct adapter *adapt, struct recv_buf *buf);void rtw_os_read_port (struct adapter *padapter,struct recv_buf *precvbuf);void rtw_init_recv_timer (struct recv_reorder_ctrl *preorder_ctrl); -int nat25_handle_frame (struct adapter *priv,struct sk_buff *skb);int _netdev_open (struct net_device *pnetdev);int netdev_open (struct net_device *pnetdev);int netdev_close (struct net_device *pnetdev);
--
1.7.10.4
PATCH 26/26 staging: rtl8188eu: Remove function with empty defination()
In reply to navin patidar--- drivers/staging/rtl8188eu/core/rtw_br_ext.c | 12 ------------ 1 file changed, 12 deletions(-)
drivers/staging/rtl8188eu/core/rtw_br_ext.c +0 -12
@@ -431,10 +431,6 @@ static void __nat25_db_network_insert(struct adapter *priv,spin_unlock_bh (&priv->br_ext_lock); } -static void __nat25_db_print (struct adapter *priv) -{ -} -/* * NAT2.5 interface */
@@ -534,7 +530,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)/* record source IP address and , source mac address into db */ __nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;case NAT25_LOOKUP :DEBUG_INFO ("NAT25: Lookup IP, SA =%08x, DA =%08x\n" , iph->saddr, iph->daddr);
@@ -587,7 +582,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method) sender = (unsigned int *)arp_ptr;__nat25_generate_ipv4_network_addr (networkAddr, sender);__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;case NAT25_LOOKUP :DEBUG_INFO ("NAT25: Lookup ARP\n" );
@@ -707,7 +701,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_generate_ipx_network_addr_with_node (networkAddr, &ipx->ipx_source.net, ipx->ipx_source.node); }__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;case NAT25_LOOKUP :if (!memcmp (GET_MY_HWADDR (priv), ipx->ipx_dest.node,ETH_ALEN )) {
@@ -752,7 +745,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;case NAT25_LOOKUP : DEBUG_INFO("NAT25: Lookup AARP, Source =%d,%d Destination =%d,%d\n",
@@ -786,7 +778,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);return 0 ;case NAT25_LOOKUP : DEBUG_INFO("NAT25: Lookup DDP, Source =%d,%d Destination =%d,%d\n",
@@ -879,7 +870,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv); if (!priv->ethBrExtInfo.addPPPoETag && priv->pppoe_connection_in_progress &&
@@ -945,7 +935,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)DEBUG_INFO ("NAT25: Lookup PPPoE, lookup session packet from %s\n" , skb->dev->name);__nat25_generate_pppoe_network_addr (networkAddr, skb->data+ETH_ALEN , &(ph->sid));__nat25_db_network_lookup_and_replace (priv, skb, networkAddr); -__nat25_db_print (priv); }else {return -1 ; }
@@ -1009,7 +998,6 @@ int nat25_db_handle(struct adapter *priv, struct sk_buff *skb, int method)if (memcmp (&iph->saddr,"\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0" ,16 )) {__nat25_generate_ipv6_network_addr (networkAddr, (__be32 *)&iph->saddr);__nat25_db_network_insert (priv, skb->data+ETH_ALEN , networkAddr); -__nat25_db_print (priv);if (iph->nexthdr ==IPPROTO_ICMPV6 && skb->len > (ETH_HLEN +sizeof (*iph) +4 )) {
Signature · 1 line
1.7.10.4
Re: [PATCH 26/26] staging: rtl8188eu: Remove function with empty defination()
These all look great. Thanks. :)
regards,
dan carpenter