Skip to content

Commit

Permalink
staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include d…
Browse files Browse the repository at this point in the history
…irectives.

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: Ali Bahar <ali@internetDog.org>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Ali Bahar authored and Greg Kroah-Hartman committed Sep 7, 2011
1 parent 99f5ff3 commit 359140a
Show file tree
Hide file tree
Showing 10 changed files with 82 additions and 23 deletions.
5 changes: 5 additions & 0 deletions drivers/staging/rtl8712/hal_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
30 changes: 7 additions & 23 deletions drivers/staging/rtl8712/osdep_service.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 4 additions & 0 deletions drivers/staging/rtl8712/recv_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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*/
Expand Down
18 changes: 18 additions & 0 deletions drivers/staging/rtl8712/rtl8712_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions drivers/staging/rtl8712/rtl871x_cmd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
9 changes: 9 additions & 0 deletions drivers/staging/rtl8712/rtl871x_ioctl_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
15 changes: 15 additions & 0 deletions drivers/staging/rtl8712/rtl871x_security.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/rtl8712/usb_intf.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

#define _HCI_INTF_C_

#include <linux/usb.h>

#include "osdep_service.h"
#include "drv_types.h"
#include "recv_osdep.h"
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/rtl8712/usb_ops_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/rtl8712/xmit_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@

#define _XMIT_OSDEP_C_

#include <linux/usb.h>

#include "osdep_service.h"
#include "drv_types.h"

Expand Down

0 comments on commit 359140a

Please sign in to comment.