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

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

diff --git a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
index 8dc898024e07f793022f92936e4d622be4ae0f85..1102451a733d60212070d423c6f2e378a99e9c1c 100644 (file)
--- a/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
+++ b/drivers/staging/rtl8712/rtl871x_mp_ioctl.h
@@ -158,28 +158,37 @@ static const struct oid_obj_priv oid_rtl_seg_81_80_00[] = {
        {1, oid_null_function},         /*0x05  OID_RT_PRO_SET_SCRAMBLER*/
        {1, oid_null_function},         /*0x06  OID_RT_PRO_SET_FILTER_BB*/
        {1, oid_null_function},         /*0x07
-                                        * OID_RT_PRO_SET_MANUAL_DIVERS_BB*/
+                                        * OID_RT_PRO_SET_MANUAL_DIVERS_BB
+                                        */
        {1, oid_rt_pro_set_channel_direct_call_hdl},    /*0x08*/
        {1, oid_null_function},         /*0x09
-                               * OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL*/
+                               * OID_RT_PRO_SET_SLEEP_MODE_DIRECT_CALL
+                               */
        {1, oid_null_function},         /*0x0A
-                               * OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL*/
+                               * OID_RT_PRO_SET_WAKE_MODE_DIRECT_CALL
+                               */
        {1, oid_rt_pro_set_continuous_tx_hdl},  /*0x0B
-                               * OID_RT_PRO_SET_TX_CONTINUOUS_DIRECT_CALL*/
+                               * OID_RT_PRO_SET_TX_CONTINUOUS_DIRECT_CALL
+                               */
        {1, oid_rt_pro_set_single_carrier_tx_hdl}, /*0x0C
-                               * OID_RT_PRO_SET_SINGLE_CARRIER_TX_CONTINUOUS*/
+                               * OID_RT_PRO_SET_SINGLE_CARRIER_TX_CONTINUOUS
+                               */
        {1, oid_null_function},         /*0x0D
-                               * OID_RT_PRO_SET_TX_ANTENNA_BB*/
+                               * OID_RT_PRO_SET_TX_ANTENNA_BB
+                               */
        {1, oid_rt_pro_set_antenna_bb_hdl},             /*0x0E*/
        {1, oid_null_function},         /*0x0F  OID_RT_PRO_SET_CR_SCRAMBLER*/
        {1, oid_null_function},         /*0x10  OID_RT_PRO_SET_CR_NEW_FILTER*/
        {1, oid_rt_pro_set_tx_power_control_hdl}, /*0x11
-                               * OID_RT_PRO_SET_TX_POWER_CONTROL*/
+                               * OID_RT_PRO_SET_TX_POWER_CONTROL
+                               */
        {1, oid_null_function},         /*0x12  OID_RT_PRO_SET_CR_TX_CONFIG*/
        {1, oid_null_function},         /*0x13
-                                        * OID_RT_PRO_GET_TX_POWER_CONTROL*/
+                                        * OID_RT_PRO_GET_TX_POWER_CONTROL
+                                        */
        {1, oid_null_function},         /*0x14
-                                        * OID_RT_PRO_GET_CR_SIGNAL_QUALITY*/
+                                        * OID_RT_PRO_GET_CR_SIGNAL_QUALITY
+                                        */
        {1, oid_null_function},         /*0x15  OID_RT_PRO_SET_CR_SETPOINT*/
        {1, oid_null_function},         /*0x16  OID_RT_PRO_SET_INTEGRATOR*/
        {1, oid_null_function},         /*0x17  OID_RT_PRO_SET_SIGNAL_QUALITY*/
@@ -203,13 +212,17 @@ static const struct oid_obj_priv oid_rtl_seg_81_80_20[] = {
        {1, oid_rt_pro_query_rx_packet_received_hdl},   /*0x26*/
        {1, oid_rt_pro_query_rx_packet_crc32_error_hdl},/*0x27*/
        {1, oid_null_function},         /*0x28
-                                        *OID_RT_PRO_QUERY_CURRENT_ADDRESS*/
+                                        *OID_RT_PRO_QUERY_CURRENT_ADDRESS
+                                        */
        {1, oid_null_function},         /*0x29
-                                        *OID_RT_PRO_QUERY_PERMANENT_ADDRESS*/
+                                        *OID_RT_PRO_QUERY_PERMANENT_ADDRESS
+                                        */
        {1, oid_null_function},         /*0x2A
-                                *OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS*/
+                                *OID_RT_PRO_SET_PHILIPS_RF_PARAMETERS
+                                */
        {1, oid_rt_pro_set_carrier_suppression_tx_hdl},/*0x2B
-                                *OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX*/
+                                *OID_RT_PRO_SET_CARRIER_SUPPRESSION_TX
+                                */
        {1, oid_null_function},         /*0x2C  OID_RT_PRO_RECEIVE_PACKET*/
        {1, oid_null_function},         /*0x2D  OID_RT_PRO_WRITE_EEPROM_BYTE*/
        {1, oid_null_function},         /*0x2E  OID_RT_PRO_READ_EEPROM_BYTE*/