diff options
| author | Shivani Bhardwaj <shivanib134@gmail.com> | 2015-10-29 00:30:01 +0530 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-10-29 08:48:47 +0900 |
| commit | d8060fc080b1ea6641d2d8c01ffb31afea045345 (patch) | |
| tree | c79a97153f1ae7310b89b4fbd193c938ad474fc8 /drivers/staging/wilc1000 | |
| parent | ce081898622bde64aa913a3740c6e1a237a52286 (diff) | |
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 <shivanib134@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/wilc1000')
| -rw-r--r-- | drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 20 |
1 files 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 @@ -2179,20 +2179,6 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, 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; } |