dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

staging: wilc1000: remove typedef from the struct tstrWILC_AddStaParam

Browse Source 
This patch removes typedef from the struct tstrWILC_AddStaParam and
renames it to add_sta_param in oder to comply with the Linux coding
style.

Signed-off-by: Tony Cho <tony.cho@atmel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Tony Cho
2015-09-20 22:59:38 -07:00
committed by Greg Kroah-Hartman
parent d0227fcbcc
commit 6a89ba9cee
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/staging/wilc1000/host_interface.c
+21 -16
View File
@@ -425,9 +425,9 @@ union message_body {
struct get_channel strHostIFGetChan;
struct set_beacon strHostIFSetBeacon; /*!< Set beacon message body */
struct del_beacon strHostIFDelBeacon; /*!< Del beacon message body */
tstrWILC_AddStaParam strAddStaParam; /*!< Add station message body */
struct add_sta_param strAddStaParam; /*!< Add station message body */
tstrHostIFDelSta strDelStaParam; /*!< Del Station message body */
tstrWILC_AddStaParam strEditStaParam; /*!< Edit station message body */
struct add_sta_param strEditStaParam; /*!< Edit station message body */
/* tstrScanComplete strScanComplete; / *Received Async. Scan Complete message body* / */
tstrTimerCb strTimerCb; /*!< Timer callback message body */
tstrHostIfPowerMgmtParam strPowerMgmtparam; /*!< Power Management message body */
@@ -3533,13 +3533,14 @@ static void Handle_DelBeacon(tstrWILC_WFIDrv *drvHandler,
/**
* @brief WILC_HostIf_PackStaParam
* @details Handling packing of the station params in a buffer
* @param[in] u8* pu8Buffer, tstrWILC_AddStaParam* pstrStationParam
* @param[in] u8* pu8Buffer, struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrStationParam)
static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer,
struct add_sta_param *pstrStationParam)
{
u8 *pu8CurrByte;
@@ -3587,13 +3588,14 @@ static u32 WILC_HostIf_PackStaParam(u8 *pu8Buffer, tstrWILC_AddStaParam *pstrSta
/**
* @brief Handle_AddStation
* @details Sending config packet to add station
* @param[in] tstrWILC_AddStaParam* pstrStationParam
* @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam)
static void Handle_AddStation(tstrWILC_WFIDrv *drvHandler,
struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -3722,13 +3724,14 @@ ERRORHANDLER:
/**
* @brief Handle_EditStation
* @details Sending config packet to edit station
* @param[in] tstrWILC_AddStaParam* pstrStationParam
* @param[in] struct add_sta_param *pstrStationParam
* @return NONE
* @author
* @date
* @version 1.0
*/
static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler, tstrWILC_AddStaParam *pstrStationParam)
static void Handle_EditStation(tstrWILC_WFIDrv *drvHandler,
struct add_sta_param *pstrStationParam)
{
s32 s32Error = 0;
tstrWID strWID;
@@ -7012,18 +7015,19 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv)
/**
* @brief host_int_add_station
* @details Setting add station params in message queue
* @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams
* @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams
* @return Error code.
* @author
* @date
* @version 1.0
*/
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
struct add_sta_param *pstrStaParams)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
@@ -7040,7 +7044,7 @@ s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSta
msg.id = HOST_IF_MSG_ADD_STATION;
msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
if (pstrAddStationMsg->u8NumRates > 0) {
u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
@@ -7162,18 +7166,19 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
/**
* @brief host_int_edit_station
* @details Setting edit station params in message queue
* @param[in] WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam* pstrStaParams
* @param[in] WILC_WFIDrvHandle hWFIDrv, struct add_sta_param *pstrStaParams
* @return Error code.
* @author
* @date
* @version 1.0
*/
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams)
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
struct add_sta_param *pstrStaParams)
{
s32 s32Error = 0;
tstrWILC_WFIDrv *pstrWFIDrv = (tstrWILC_WFIDrv *)hWFIDrv;
struct host_if_msg msg;
tstrWILC_AddStaParam *pstrAddStationMsg = &msg.body.strAddStaParam;
struct add_sta_param *pstrAddStationMsg = &msg.body.strAddStaParam;
if (pstrWFIDrv == NULL) {
PRINT_ER("driver is null\n");
@@ -7189,7 +7194,7 @@ s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrSt
msg.id = HOST_IF_MSG_EDIT_STATION;
msg.drvHandler = hWFIDrv;
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(tstrWILC_AddStaParam));
memcpy(pstrAddStationMsg, pstrStaParams, sizeof(struct add_sta_param));
if (pstrAddStationMsg->u8NumRates > 0) {
u8 *rates = kmalloc(pstrAddStationMsg->u8NumRates, GFP_KERNEL);
drivers/staging/wilc1000/host_interface.h
+10 -6
View File
@@ -369,7 +369,7 @@ typedef enum {
WILC_STA_FLAG_AUTHENTICATED /*!< station is authenticated*/
} tenuWILC_StaFlag;
typedef struct {
struct add_sta_param {
u8 au8BSSID[ETH_ALEN];
u16 u16AssocID;
u8 u8NumRates;
@@ -383,7 +383,7 @@ typedef struct {
u8 u8ASELCap;
u16 u16FlagsMask; /*<! Determines which of u16FlagsSet were changed>*/
u16 u16FlagsSet; /*<! Decoded according to tenuWILC_StaFlag */
} tstrWILC_AddStaParam;
};
/*****************************************************************************/
/* */
@@ -1049,7 +1049,8 @@ s32 host_int_add_beacon(tstrWILC_WFIDrv *hWFIDrv, u32 u32Interval,
s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);
/*!
* @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
* @fn s32 host_int_add_station(WILC_WFIDrvHandle hWFIDrv,
* struct add_sta_param *pstrStaParams)
* @brief Notifies the firmware with a new associated stations
* @details
* @param[in,out] hWFIDrv handle to the wifi driver
@@ -1061,7 +1062,8 @@ s32 host_int_del_beacon(tstrWILC_WFIDrv *hWFIDrv);
* @date 12 July 2012
* @version 1.0 Description
*/
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
s32 host_int_add_station(tstrWILC_WFIDrv *hWFIDrv,
struct add_sta_param *pstrStaParams);
/*!
* @fn s32 host_int_del_allstation(WILC_WFIDrvHandle hWFIDrv, const u8* pu8MacAddr)
@@ -1094,7 +1096,8 @@ s32 host_int_del_allstation(tstrWILC_WFIDrv *hWFIDrv, u8 pu8MacAddr[][ETH_ALEN])
s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr);
/*!
* @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv, tstrWILC_AddStaParam strStaParams)
* @fn s32 host_int_edit_station(WILC_WFIDrvHandle hWFIDrv,
* struct add_sta_param *pstrStaParams)
* @brief Notifies the firmware with new parameters of an already associated station
* @details
* @param[in,out] hWFIDrv handle to the wifi driver
@@ -1106,7 +1109,8 @@ s32 host_int_del_station(tstrWILC_WFIDrv *hWFIDrv, const u8 *pu8MacAddr);
* @date 15 July 2012
* @version 1.0 Description
*/
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv, tstrWILC_AddStaParam *pstrStaParams);
s32 host_int_edit_station(tstrWILC_WFIDrv *hWFIDrv,
struct add_sta_param *pstrStaParams);
/*!
* @fn s32 host_int_set_power_mgmt(WILC_WFIDrvHandle hWFIDrv, bool bIsEnabled, u32 u32Timeout)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c
+2 -2
View File
@@ -3155,7 +3155,7 @@ static int add_station(struct wiphy *wiphy, struct net_device *dev,
{
s32 s32Error = 0;
struct wilc_priv *priv;
tstrWILC_AddStaParam strStaParams = { {0} };
struct add_sta_param strStaParams = { {0} };
perInterface_wlan_t *nic;
if (!wiphy)
@@ -3266,7 +3266,7 @@ static int change_station(struct wiphy *wiphy, struct net_device *dev,
{
s32 s32Error = 0;
struct wilc_priv *priv;
tstrWILC_AddStaParam strStaParams = { {0} };
struct add_sta_param strStaParams = { {0} };
perInterface_wlan_t *nic;