Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/rtl8712/hal_init.c

+5 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/rtl8712/osdep_service.h

+7 −23
Original line number Diff line number Diff line
@@ -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 "basic_types.h"



struct	__queue	{

	struct	list_head	queue;

drivers/staging/rtl8712/recv_linux.c

+4 −0
Original line number Diff line number Diff line
@@ -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*/

drivers/staging/rtl8712/rtl8712_cmd.c

+18 −0
Original line number Diff line number Diff line
@@ -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"

drivers/staging/rtl8712/rtl871x_cmd.c

+18 −0
Original line number Diff line number Diff line
@@ -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"