Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / rtl8712 / rtl871x_cmd.h

diff --git a/drivers/staging/rtl8712/rtl871x_cmd.h b/drivers/staging/rtl8712/rtl871x_cmd.h
index e4a2a50c85de792cdf056d57369766c4e6e8d2fb..a2cee36cc347b2b5406b4aeef6021834d382aad8 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_cmd.h
+++ b/drivers/staging/rtl8712/rtl871x_cmd.h
@@ -50,8 +50,8 @@ struct cmd_obj {
 };
 
 struct cmd_priv {
-       struct semaphore cmd_queue_sema;
-       struct semaphore terminate_cmdthread_sema;
+       struct completion cmd_queue_comp;
+       struct completion terminate_cmdthread_comp;
        struct  __queue cmd_queue;
        u8 cmd_seq;
        u8 *cmd_buf;    /*shall be non-paged, and 4 bytes aligned*/
@@ -185,10 +185,12 @@ struct setauth_parm {
  */
 struct setkey_parm {
        u8      algorithm;      /* encryption algorithm, could be none, wep40,
-                                * TKIP, CCMP, wep104 */
+                                * TKIP, CCMP, wep104
+                                */
        u8      keyid;
        u8      grpkey;         /* 1: this is the grpkey for 802.1x.
-                                * 0: this is the unicast key for 802.1x */
+                                * 0: this is the unicast key for 802.1x
+                                */
        u8      key[16];        /* this could be 40 or 104 */
 };
 
@@ -570,7 +572,8 @@ struct setpwrmode_parm  {
        u8      bcn_rx_en;
        u8      bcn_pass_cnt;     /* fw report one beacon information to
                                   * driver  when it receives bcn_pass_cnt
-                                  *  beacons. */
+                                  * beacons.
+                                  */
        u8      bcn_to;           /* beacon TO (ms). ¡§=0¡¨ no limit.*/
        u16     bcn_itv;
        u8      app_itv; /* only for VOIP mode. */