Commit 359140aa authored by Ali Bahar's avatar Ali Bahar Committed by Greg Kroah-Hartman

staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives.

These are the new include directives for header files.
The following were (somehow!) not explicity in Realtek's, but proved necessary:
"linux/usb.h" is needed for usb_alloc_urb();
"linux/interrupt.h" is needed for tasklet_struct. It was often a nested
include.
Signed-off-by: default avatarAli Bahar <ali@internetDog.org>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 99f5ff39
...@@ -28,6 +28,11 @@ ...@@ -28,6 +28,11 @@
#define _HAL_INIT_C_ #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 "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "rtl871x_byteorder.h" #include "rtl871x_byteorder.h"
......
...@@ -29,35 +29,19 @@ ...@@ -29,35 +29,19 @@
#define _SUCCESS 1 #define _SUCCESS 1
#define _FAIL 0 #define _FAIL 0
#include "basic_types.h" #include <linux/version.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/semaphore.h> #include <linux/semaphore.h>
#include <linux/sched.h>
#include <linux/sem.h> #include <linux/sem.h>
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <net/iw_handler.h> #include <net/iw_handler.h>
#include <linux/proc_fs.h> /* Necessary because we use the proc fs */ #include <linux/proc_fs.h> /* Necessary because we use the proc fs */
#include <linux/compiler.h>
#include <linux/kernel.h> #include "basic_types.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>
struct __queue { struct __queue {
struct list_head queue; struct list_head queue;
......
...@@ -28,11 +28,15 @@ ...@@ -28,11 +28,15 @@
#define _RECV_OSDEP_C_ #define _RECV_OSDEP_C_
#include <linux/usb.h>
#include "osdep_service.h" #include "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "wifi.h" #include "wifi.h"
#include "recv_osdep.h" #include "recv_osdep.h"
#include "osdep_intf.h" #include "osdep_intf.h"
#include "ethernet.h"
#include <linux/if_arp.h>
#include "usb_ops.h" #include "usb_ops.h"
/*init os related resource in struct recv_priv*/ /*init os related resource in struct recv_priv*/
......
...@@ -28,6 +28,24 @@ ...@@ -28,6 +28,24 @@
#define _RTL8712_CMD_C_ #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 "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "recv_osdep.h" #include "recv_osdep.h"
......
...@@ -28,6 +28,24 @@ ...@@ -28,6 +28,24 @@
#define _RTL871X_CMD_C_ #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 "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "recv_osdep.h" #include "recv_osdep.h"
......
...@@ -39,6 +39,15 @@ ...@@ -39,6 +39,15 @@
#include "rtl871x_ioctl_set.h" #include "rtl871x_ioctl_set.h"
#include "rtl871x_mp_ioctl.h" #include "rtl871x_mp_ioctl.h"
#include "mlme_osdep.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) #define RTL_IOCTL_WPA_SUPPLICANT (SIOCIWFIRSTPRIV + 30)
......
...@@ -28,6 +28,21 @@ ...@@ -28,6 +28,21 @@
#define _RTL871X_SECURITY_C_ #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 "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "wifi.h" #include "wifi.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#define _HCI_INTF_C_ #define _HCI_INTF_C_
#include <linux/usb.h>
#include "osdep_service.h" #include "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "recv_osdep.h" #include "recv_osdep.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#define _HCI_OPS_OS_C_ #define _HCI_OPS_OS_C_
#include <linux/usb.h>
#include "osdep_service.h" #include "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
#include "osdep_intf.h" #include "osdep_intf.h"
......
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
#define _XMIT_OSDEP_C_ #define _XMIT_OSDEP_C_
#include <linux/usb.h>
#include "osdep_service.h" #include "osdep_service.h"
#include "drv_types.h" #include "drv_types.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment