Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 268287
b: refs/heads/master
c: 359140a
h: refs/heads/master
i:
  268285: 4b0eea4
  268283: 8d55764
  268279: edd8ce7
  268271: 2e0dc19
  268255: cde25f9
  268223: da8ccb8
  268159: b1258fa
  268031: 5af5175
  267775: 715bb8c
  267263: ed20d5e
  266239: 79d1193
v: v3
  • Loading branch information
Ali Bahar authored and Greg Kroah-Hartman committed Sep 7, 2011
1 parent d00dde1 commit f967bda
Show file tree
Hide file tree
Showing 11 changed files with 83 additions and 24 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 99f5ff39d24915533d5bcf557e75116c706bd6dd
refs/heads/master: 359140aaea5bc3123356d46d0daa9dac8cfb12bc
5 changes: 5 additions & 0 deletions trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 trunk/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 f967bda

Please sign in to comment.