From: Tony Cho Date: Wed, 30 Sep 2015 09:44:30 +0000 (+0900) Subject: staging: wilc1000: rename struct set_beacon X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7f33fecde162d8694fd3072aa70b59d459330d35;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git staging: wilc1000: rename struct set_beacon This patch renames struct set_beacon to beacon_attr to keep the naming convention as scan_attr, connect_attr and channel_attr. Signed-off-by: Tony Cho Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/wilc1000/host_interface.c b/drivers/staging/wilc1000/host_interface.c index 686402a9dcf3..2f211f908673 100644 --- a/drivers/staging/wilc1000/host_interface.c +++ b/drivers/staging/wilc1000/host_interface.c @@ -248,7 +248,7 @@ struct channel_attr { * } tstrScanComplete;*/ /*! - * @struct set_beacon + * @struct beacon_attr * @brief Set Beacon message body * @details * @todo @@ -257,7 +257,7 @@ struct channel_attr { * @date 10 July 2012 * @version 1.0 */ -struct set_beacon { +struct beacon_attr { u32 u32Interval; /*!< Beacon Interval. Period between two successive beacons on air */ u32 u32DTIMPeriod; /*!< DTIM Period. Indicates how many Beacon frames * (including the current frame) appear before the next DTIM */ @@ -391,7 +391,7 @@ union message_body { struct key_attr key_info; struct cfg_param_attr cfg_info; struct channel_attr channel_info; - struct set_beacon strHostIFSetBeacon; + struct beacon_attr strHostIFSetBeacon; struct add_sta_param strAddStaParam; struct del_sta strDelStaParam; struct add_sta_param strEditStaParam; @@ -3158,14 +3158,14 @@ static s32 Handle_Get_InActiveTime(tstrWILC_WFIDrv *drvHandler, /** * @brief Handle_AddBeacon * @details Sending config packet to add beacon - * @param[in] struct set_beacon *pstrSetBeaconParam + * @param[in] struct beacon_attr *pstrSetBeaconParam * @return NONE * @author * @date * @version 1.0 */ static void Handle_AddBeacon(tstrWILC_WFIDrv *drvHandler, - struct set_beacon *pstrSetBeaconParam) + struct beacon_attr *pstrSetBeaconParam) { s32 s32Error = 0; tstrWID strWID; @@ -6548,7 +6548,7 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval, s32 s32Error = 0; tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv; struct host_if_msg msg; - struct set_beacon *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon; + struct beacon_attr *pstrSetBeaconParam = &msg.body.strHostIFSetBeacon; if (pstrWFIDrv == NULL) { PRINT_ER("driver is null\n");