Skip to contentSkip to conversation

Staging: wilc1000: wilc_wfi_cfgoperations: Remove irrelevant wrapper function

PATCH New Shivani Bhardwaj 1 participant 1 message Oct 28, 2015 Staging

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Staging: wilc1000: wilc_wfi_cfgoperations: Remove irrelevant wrapper function

Remove the wrapper function WILC_WFI_add_wilcvendorspec() and replace its call with memcpy().

---
 drivers/staging/wilc1000/wilc_wfi_cfgoperations.c | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)
drivers/staging/wilc1000/wilc_wfi_cfgoperations.c +5 -15
index ac32d2b..7a03b0d 100644
@@ -2180,20 +2180,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
  *
@@ -2316,7 +2302,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;
 								}
Signature · 1 line
2.1.0