---

yaml --- r: 267676 b: refs/heads/master c: 6e2c538 h: refs/heads/master v: v3
git-mirror · Aug 24, 2011 · 4f2b3d3 · 4f2b3d3
1 parent 309adf5
commit 4f2b3d3
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 22 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bfb74db3e58c6362d877b299e5b68c512fc500db
+refs/heads/master: 6e2c538f8fbca87276a83eec5ac9212bbbfa13fa
diff --git a/trunk/drivers/staging/rtl8192e/rtl819x_BAProc.c b/trunk/drivers/staging/rtl8192e/rtl819x_BAProc.c
@@ -19,9 +19,6 @@
 #include "rtllib.h"
 #include "rtl819x_BA.h"
 #include "rtl_core.h"
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
 
 void ActivateBAEntry(struct rtllib_device* ieee, PBA_RECORD pBA, u16 Time)
 {

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_module.c b/trunk/drivers/staging/rtl8192e/rtllib_module.c
@@ -88,13 +88,9 @@ static inline int rtllib_networks_allocate(struct rtllib_device *ieee)
 	if (ieee->networks)
 		return 0;
 
-#ifndef RTK_DMP_PLATFORM
 	ieee->networks = kmalloc(
 		MAX_NETWORK_COUNT * sizeof(struct rtllib_network),
 		GFP_KERNEL);
-#else
-	ieee->networks = dvr_malloc(MAX_NETWORK_COUNT * sizeof(struct rtllib_network));
-#endif
 	if (!ieee->networks) {
 		printk(KERN_WARNING "%s: Out of memory allocating beacons\n",
 		       ieee->dev->name);
@@ -111,11 +107,7 @@ static inline void rtllib_networks_free(struct rtllib_device *ieee)
 {
 	if (!ieee->networks)
 		return;
-#ifndef RTK_DMP_PLATFORM
 	kfree(ieee->networks);
-#else
-	dvr_free(ieee->networks);
-#endif
 	ieee->networks = NULL;
 }
 

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_softmac.c b/trunk/drivers/staging/rtl8192e/rtllib_softmac.c
@@ -23,9 +23,6 @@
 #include <asm/uaccess.h>
 #include "dot11d.h"
 
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
 extern void _setup_timer( struct timer_list*, void*, unsigned long );
 u8 rsn_authen_cipher_suite[16][4] = {
 	{0x00,0x0F,0xAC,0x00},
@@ -1634,9 +1631,6 @@ void rtllib_associate_complete_wq(void *data)
 	if (ieee->data_hard_resume)
 		ieee->data_hard_resume(ieee->dev);
 
-#ifdef RTK_DMP_PLATFORM
-	kobject_hotplug(&ieee->dev->class_dev.kobj, KOBJ_LINKUP);
-#endif
 }
 
 static void rtllib_sta_send_associnfo(struct rtllib_device *ieee)

diff --git a/trunk/drivers/staging/rtl8192e/rtllib_tx.c b/trunk/drivers/staging/rtl8192e/rtllib_tx.c
@@ -54,10 +54,6 @@
 
 #include "rtllib.h"
 
-#ifdef RTK_DMP_PLATFORM
-#include <linux/usb_setting.h>
-#endif
-
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,10 +54,6 @@ @@
     #include "rtllib.h"
-    #ifdef RTK_DMP_PLATFORM
-    #include <linux/usb_setting.h>
-    #endif
     /*
@@ Expand Down @@