From d8060fc080b1ea6641d2d8c01ffb31afea045345 Mon Sep 17 00:00:00 2001 From: Shivani Bhardwaj Date: Thu, 29 Oct 2015 00:30:01 +0530 Subject: [PATCH] Staging: wilc1000: wilc_wfi_cfgoperations: Remove irrelevant wrapper function Remove the wrapper function WILC_WFI_add_wilcvendorspec() and replace its call with memcpy(). Signed-off-by: Shivani Bhardwaj Signed-off-by: Greg Kroah-Hartman --- .../staging/wilc1000/wilc_wfi_cfgoperations.c | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c index bf7a2a22da62..3e9501727812 100644 --- a/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +++ b/drivers/staging/wilc1000/wilc_wfi_cfgoperations.c @@ -2178,20 +2178,6 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, s32Error = host_int_ListenStateExpired(priv->hWILCWFIDrv, priv->strRemainOnChanParams.u32ListenSessionID); return s32Error; } -/** - * @brief WILC_WFI_add_wilcvendorspec - * @details Adding WILC information elemet to allow two WILC devices to - * identify each other and connect - * @param[in] u8 * buf - * @return void - * @author mdaftedar - * @date 01 JAN 2014 - * @version 1.0 - */ -void WILC_WFI_add_wilcvendorspec(u8 *buff) -{ - memcpy(buff, u8P2P_vendorspec, sizeof(u8P2P_vendorspec)); -} /** * @brief WILC_WFI_mgmt_tx_frame * @details @@ -2315,7 +2301,11 @@ static int mgmt_tx(struct wiphy *wiphy, } if (buf[P2P_PUB_ACTION_SUBTYPE] != P2P_INV_REQ && buf[P2P_PUB_ACTION_SUBTYPE] != P2P_INV_RSP) { - WILC_WFI_add_wilcvendorspec(&mgmt_tx->buff[len]); + /* + * Adding WILC information element to allow two WILC devices to + * identify each other and connect + */ + memcpy(&mgmt_tx->buff[len], u8P2P_vendorspec, sizeof(u8P2P_vendorspec)); mgmt_tx->buff[len + sizeof(u8P2P_vendorspec)] = u8P2Plocalrandom; mgmt_tx->size = buf_len; } -- 2.20.1