drivers/staging: qca-wifi-host-cmn: Rename function to avoid conflict

This uses nl80211hdr_put() and initialises it with a struct before returning. Rename this entire function to avoid conflict when the driver is built into the kernel. This commit has no functional change Signed-off-by: Vaisakh Murali <[email protected]>
mvaisakh · Jan 28, 2024 · 2805253 · 2805253
1 parent b072da4
commit 2805253
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/drivers/staging/qca-wifi-host-cmn/utils/nlink/inc/wlan_nlink_srv.h b/drivers/staging/qca-wifi-host-cmn/utils/nlink/inc/wlan_nlink_srv.h
@@ -81,7 +81,7 @@ int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag,
 int nl_srv_bcast(struct sk_buff *skb, int mcgroup_id, int app_id);
 
 /**
- * nl80211hdr_put() - API to fill genlmsg header
+ * nl80211hdr_put_qca() - API to fill genlmsg header
  * @skb: Sk buffer
  * @portid: Port ID
  * @seq: Sequence number
@@ -92,7 +92,7 @@ int nl_srv_bcast(struct sk_buff *skb, int mcgroup_id, int app_id);
  *
  * Return: Pointer to user specific header/payload
  */
-void *nl80211hdr_put(struct sk_buff *skb, uint32_t portid,
+void *nl80211hdr_put_qca(struct sk_buff *skb, uint32_t portid,
 		     uint32_t seq, int flags, uint8_t cmd);
 #else
 int nl_srv_ucast(struct sk_buff *skb, int dst_pid, int flag);

diff --git a/drivers/staging/qca-wifi-host-cmn/utils/nlink/src/wlan_nlink_srv.c b/drivers/staging/qca-wifi-host-cmn/utils/nlink/src/wlan_nlink_srv.c
@@ -295,7 +295,7 @@ cld80211_oem_rsp_alloc_skb(uint32_t portid, void **hdr, struct nlattr **nest,
 		return NULL;
 	}
 
-	*hdr = nl80211hdr_put(msg, portid, 0, *flags, WLAN_NL_MSG_OEM);
+	*hdr = nl80211hdr_put_qca(msg, portid, 0, *flags, WLAN_NL_MSG_OEM);
 	if (*hdr == NULL) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 					"nl80211 hdr put failed");
@@ -341,7 +341,7 @@ int nl_srv_unregister(tWlanNlModTypes msg_type, nl_srv_msg_callback msg_handler)
 	return 0;
 }
 
-void *nl80211hdr_put(struct sk_buff *skb, uint32_t portid,
+void *nl80211hdr_put_qca(struct sk_buff *skb, uint32_t portid,
 		     uint32_t seq, int flags, uint8_t cmd)
 {
 	struct genl_family *cld80211_fam = cld80211_get_genl_family();
@@ -370,7 +370,7 @@ static int cld80211_fill_data(struct sk_buff *msg, uint32_t portid,
 	void *hdr;
 	struct nlattr *nest;
 
-	hdr = nl80211hdr_put(msg, portid, seq, flags, cmd);
+	hdr = nl80211hdr_put_qca(msg, portid, seq, flags, cmd);
 	if (!hdr) {
 		QDF_TRACE(QDF_MODULE_ID_HDD, QDF_TRACE_LEVEL_ERROR,
 						"nl80211 hdr put failed");