From f967bdadb31a49a7d9775f0d2e4fd79256ecf9a5 Mon Sep 17 00:00:00 2001
From: Ali Bahar <ali@internetdog.org>
Date: Sun, 4 Sep 2011 03:14:11 +0800
Subject: [PATCH] --- yaml --- r: 268287 b: refs/heads/master c:
 359140aaea5bc3123356d46d0daa9dac8cfb12bc h: refs/heads/master i:   268285:
 4b0eea4ee5af53c387173526c327569140801c71   268283:
 8d55764066b5ea7a77bccf929eec3cf6d2c1b6db   268279:
 edd8ce73cbbe05373ee081767b0ab23634a97f2c   268271:
 2e0dc19a919d52e6f76c09c9cbb07131bfb0f951   268255:
 cde25f96250ead8862665a8f791a4b12b8b4f75a   268223:
 da8ccb8ab22432a8fefa99715553951719b99b73   268159:
 b1258fa8ff768164b55cd48bc0a656dfa9c056f4   268031:
 5af5175deabd00a2b803e1f82aac3dd62d79ce61   267775:
 715bb8c95dd332b0086b6553022882bc7ceecde3   267263:
 ed20d5e1841eeedddf130c032b316d7a87d55cc3   266239:
 79d1193d4f9a44b874ec8089d10a7c49d00f5c12 v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/staging/rtl8712/hal_init.c      |  5 ++++
 trunk/drivers/staging/rtl8712/osdep_service.h | 30 +++++--------------
 trunk/drivers/staging/rtl8712/recv_linux.c    |  4 +++
 trunk/drivers/staging/rtl8712/rtl8712_cmd.c   | 18 +++++++++++
 trunk/drivers/staging/rtl8712/rtl871x_cmd.c   | 18 +++++++++++
 .../staging/rtl8712/rtl871x_ioctl_linux.c     |  9 ++++++
 .../staging/rtl8712/rtl871x_security.c        | 15 ++++++++++
 trunk/drivers/staging/rtl8712/usb_intf.c      |  2 ++
 trunk/drivers/staging/rtl8712/usb_ops_linux.c |  2 ++
 trunk/drivers/staging/rtl8712/xmit_linux.c    |  2 ++
 11 files changed, 83 insertions(+), 24 deletions(-)

diff --git a/[refs] b/[refs]
index 9953af18b71a..f175a7cd0891 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99f5ff39d24915533d5bcf557e75116c706bd6dd
+refs/heads/master: 359140aaea5bc3123356d46d0daa9dac8cfb12bc
diff --git a/trunk/drivers/staging/rtl8712/hal_init.c b/trunk/drivers/staging/rtl8712/hal_init.c
index 1411c7bf0d40..1bd9c374a5fc 100644
--- a/trunk/drivers/staging/rtl8712/hal_init.c
+++ b/trunk/drivers/staging/rtl8712/hal_init.c
@@ -28,6 +28,11 @@
 
 #define _HAL_INIT_C_
 
+#include <linux/usb.h>
+#include <linux/device.h>
+#include <linux/usb/ch9.h>
+#include <linux/firmware.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "rtl871x_byteorder.h"
diff --git a/trunk/drivers/staging/rtl8712/osdep_service.h b/trunk/drivers/staging/rtl8712/osdep_service.h
index 66195601e713..1ee943a58c4c 100644
--- a/trunk/drivers/staging/rtl8712/osdep_service.h
+++ b/trunk/drivers/staging/rtl8712/osdep_service.h
@@ -29,35 +29,19 @@
 #define _SUCCESS	1
 #define _FAIL		0
 
-#include "basic_types.h"
+#include <linux/version.h>
 #include <linux/spinlock.h>
+
+#include <linux/interrupt.h>
 #include <linux/semaphore.h>
+#include <linux/sched.h>
 #include <linux/sem.h>
 #include <linux/netdevice.h>
 #include <linux/etherdevice.h>
 #include <net/iw_handler.h>
-#include <linux/proc_fs.h>	/* Necessary because we use the proc fs */
-#include <linux/compiler.h>
-#include <linux/kernel.h>
-#include <linux/errno.h>
-#include <linux/init.h>
-#include <linux/slab.h>
-#include <linux/module.h>
-#include <linux/sched.h>
-#include <linux/kref.h>
-#include <linux/skbuff.h>
-#include <linux/usb.h>
-#include <linux/usb/ch9.h>
-#include <linux/io.h>
-#include <linux/circ_buf.h>
-#include <linux/uaccess.h>
-#include <asm/byteorder.h>
-#include <linux/atomic.h>
-#include <linux/wireless.h>
-#include <linux/rtnetlink.h>
-#include "ethernet.h"
-#include <linux/if_arp.h>
-#include <linux/firmware.h>
+#include <linux/proc_fs.h>      /* Necessary because we use the proc fs */
+
+#include "basic_types.h"
 
 struct	__queue	{
 	struct	list_head	queue;
diff --git a/trunk/drivers/staging/rtl8712/recv_linux.c b/trunk/drivers/staging/rtl8712/recv_linux.c
index 1e5c59be3a20..0e26d5f6cf2d 100644
--- a/trunk/drivers/staging/rtl8712/recv_linux.c
+++ b/trunk/drivers/staging/rtl8712/recv_linux.c
@@ -28,11 +28,15 @@
 
 #define _RECV_OSDEP_C_
 
+#include <linux/usb.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "wifi.h"
 #include "recv_osdep.h"
 #include "osdep_intf.h"
+#include "ethernet.h"
+#include <linux/if_arp.h>
 #include "usb_ops.h"
 
 /*init os related resource in struct recv_priv*/
diff --git a/trunk/drivers/staging/rtl8712/rtl8712_cmd.c b/trunk/drivers/staging/rtl8712/rtl8712_cmd.c
index 26c605e8cd6f..9f6ebc419b0b 100644
--- a/trunk/drivers/staging/rtl8712/rtl8712_cmd.c
+++ b/trunk/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -28,6 +28,24 @@
 
 #define _RTL8712_CMD_C_
 
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kref.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/circ_buf.h>
+#include <linux/uaccess.h>
+#include <asm/byteorder.h>
+#include <linux/atomic.h>
+#include <linux/semaphore.h>
+#include <linux/rtnetlink.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
index ba92762dbb1c..e188d8dcfde9 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_cmd.c
@@ -28,6 +28,24 @@
 
 #define _RTL871X_CMD_C_
 
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kref.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/usb.h>
+#include <linux/usb/ch9.h>
+#include <linux/circ_buf.h>
+#include <linux/uaccess.h>
+#include <asm/byteorder.h>
+#include <linux/atomic.h>
+#include <linux/semaphore.h>
+#include <linux/rtnetlink.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
index ba700815ead0..ec58b6636fac 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_ioctl_linux.c
@@ -39,6 +39,15 @@
 #include "rtl871x_ioctl_set.h"
 #include "rtl871x_mp_ioctl.h"
 #include "mlme_osdep.h"
+#include <linux/wireless.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/version.h>
+#include <linux/io.h>
+#include <linux/semaphore.h>
+#include <net/iw_handler.h>
+#include <linux/if_arp.h>
 
 #define RTL_IOCTL_WPA_SUPPLICANT	(SIOCIWFIRSTPRIV + 30)
 
diff --git a/trunk/drivers/staging/rtl8712/rtl871x_security.c b/trunk/drivers/staging/rtl8712/rtl871x_security.c
index 65321bed4d5d..7b92927a04dc 100644
--- a/trunk/drivers/staging/rtl8712/rtl871x_security.c
+++ b/trunk/drivers/staging/rtl8712/rtl871x_security.c
@@ -28,6 +28,21 @@
 
 #define  _RTL871X_SECURITY_C_
 
+#include <linux/compiler.h>
+#include <linux/kernel.h>
+#include <linux/errno.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/module.h>
+#include <linux/kref.h>
+#include <linux/netdevice.h>
+#include <linux/skbuff.h>
+#include <linux/circ_buf.h>
+#include <linux/uaccess.h>
+#include <asm/byteorder.h>
+#include <linux/atomic.h>
+#include <linux/semaphore.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "wifi.h"
diff --git a/trunk/drivers/staging/rtl8712/usb_intf.c b/trunk/drivers/staging/rtl8712/usb_intf.c
index 263a4b510ed3..3447d755a60b 100644
--- a/trunk/drivers/staging/rtl8712/usb_intf.c
+++ b/trunk/drivers/staging/rtl8712/usb_intf.c
@@ -28,6 +28,8 @@
 
 #define _HCI_INTF_C_
 
+#include <linux/usb.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "recv_osdep.h"
diff --git a/trunk/drivers/staging/rtl8712/usb_ops_linux.c b/trunk/drivers/staging/rtl8712/usb_ops_linux.c
index 54757dd21147..b796c6bb5931 100644
--- a/trunk/drivers/staging/rtl8712/usb_ops_linux.c
+++ b/trunk/drivers/staging/rtl8712/usb_ops_linux.c
@@ -28,6 +28,8 @@
 
 #define _HCI_OPS_OS_C_
 
+#include <linux/usb.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"
 #include "osdep_intf.h"
diff --git a/trunk/drivers/staging/rtl8712/xmit_linux.c b/trunk/drivers/staging/rtl8712/xmit_linux.c
index 6b7987d3a1cb..d3535ba5dd43 100644
--- a/trunk/drivers/staging/rtl8712/xmit_linux.c
+++ b/trunk/drivers/staging/rtl8712/xmit_linux.c
@@ -28,6 +28,8 @@
 
 #define _XMIT_OSDEP_C_
 
+#include <linux/usb.h>
+
 #include "osdep_service.h"
 #include "drv_types.h"