Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8060fc0 authored by Shivani Bhardwaj's avatar Shivani Bhardwaj Committed by Greg Kroah-Hartman
Browse files

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: default avatarShivani Bhardwaj <shivanib134@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ce081898

drivers/staging/wilc1000/wilc_wfi_cfgoperations.c

+5 −15
Original line number Original line Diff line number Diff line
@@ -2178,20 +2178,6 @@ static int cancel_remain_on_channel(struct wiphy *wiphy, 
	s32Error = host_int_ListenStateExpired(priv->hWILCWFIDrv, priv->strRemainOnChanParams.u32ListenSessionID);

	s32Error = host_int_ListenStateExpired(priv->hWILCWFIDrv, priv->strRemainOnChanParams.u32ListenSessionID);

	return s32Error;

	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

 *  @brief      WILC_WFI_mgmt_tx_frame

 *  @details

 *  @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) {

								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->buff[len + sizeof(u8P2P_vendorspec)] = u8P2Plocalrandom;

									mgmt_tx->size = buf_len;

									mgmt_tx->size = buf_len;

								}

								}