qcacmn: dp: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF (0761d6c2) · Commits · e / devices / android_kernel_oneplus_sm7250

dp/wifi3.0/dp_ipa.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -1258,7 +1258,8 @@ QDF_STATUS dp_ipa_setup_iface(char ifname, uint8_t mac_addr,
		struct dp_ipa_uc_tx_hdr uc_tx_hdr_v6;
		int ret = -EINVAL;

		dp_debug("Add Partial hdr: %s, %pM", ifname, mac_addr);
		dp_debug("Add Partial hdr: %s, "QDF_MAC_ADDR_FMT, ifname,
		QDF_MAC_ADDR_REF(mac_addr));
		qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));
		qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);

		@@ -1513,8 +1514,8 @@ QDF_STATUS dp_ipa_setup_iface(char ifname, uint8_t mac_addr,
		int ret = -EINVAL;

		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_DEBUG,
		"%s: Add Partial hdr: %s, %pM",
		__func__, ifname, mac_addr);
		"%s: Add Partial hdr: %s, "QDF_MAC_ADDR_FMT,
		__func__, ifname, QDF_MAC_ADDR_REF(mac_addr));

		qdf_mem_zero(&hdr_info, sizeof(qdf_ipa_wdi_hdr_info_t));
		qdf_ether_addr_copy(uc_tx_hdr.eth.h_source, mac_addr);

dp/wifi3.0/dp_main.c

+32 −25

Original line number	Diff line number	Diff line
		@@ -1195,8 +1195,8 @@ void dp_print_ast_stats(struct dp_soc *soc)
		DP_PDEV_ITERATE_VDEV_LIST(pdev, vdev) {
		DP_VDEV_ITERATE_PEER_LIST(vdev, peer) {
		DP_PEER_ITERATE_ASE_LIST(peer, ase, tmp_ase) {
		DP_PRINT_STATS("%6d mac_addr = %pM"
		" peer_mac_addr = %pM"
		DP_PRINT_STATS("%6d mac_addr = "QDF_MAC_ADDR_FMT
		" peer_mac_addr = "QDF_MAC_ADDR_FMT
		" peer_id = %u"
		" type = %s"
		" next_hop = %d"
		@@ -1207,8 +1207,8 @@ void dp_print_ast_stats(struct dp_soc *soc)
		" pdev_id = %d"
		" vdev_id = %d",
		++num_entries,
		ase->mac_addr.raw,
		ase->peer->mac_addr.raw,
		QDF_MAC_ADDR_REF(ase->mac_addr.raw),
		QDF_MAC_ADDR_REF(ase->peer->mac_addr.raw),
		ase->peer->peer_ids[0],
		type[ase->type],
		ase->next_hop,
		@@ -1249,7 +1249,7 @@ static void dp_print_peer_table(struct dp_vdev *vdev)
		DP_PRINT_STATS("Invalid Peer");
		return;
		}
		DP_PRINT_STATS(" peer_mac_addr = %pM"
		DP_PRINT_STATS(" peer_mac_addr = "QDF_MAC_ADDR_FMT
		" nawds_enabled = %d"
		" bss_peer = %d"
		" wds_enabled = %d"
		@@ -1257,7 +1257,7 @@ static void dp_print_peer_table(struct dp_vdev *vdev)
		" rx_cap_enabled = %d"
		" delete in progress = %d"
		" peer id = %d",
		peer->mac_addr.raw,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		peer->nawds_enabled,
		peer->bss_peer,
		peer->wds_enabled,
		@@ -5333,7 +5333,8 @@ static QDF_STATUS dp_vdev_attach_wifi3(struct cdp_soc_t *cdp_soc,
		if (pdev->vdev_count == 1)
		dp_lro_hash_setup(soc, pdev);

		dp_info("Created vdev %pK (%pM)", vdev, vdev->mac_addr.raw);
		dp_info("Created vdev %pK ("QDF_MAC_ADDR_FMT")", vdev,
		QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
		DP_STATS_INIT(vdev);

		if (wlan_op_mode_sta == vdev->opmode)
		@@ -5484,8 +5485,8 @@ static void dp_vdev_flush_peers(struct cdp_vdev *vdev_handle, bool unmap_only)
		for (m = 0; m < n ; m++) {
		peer = peer_array[m];

		dp_info("peer: %pM is getting deleted",
		peer->mac_addr.raw);
		dp_info("peer: "QDF_MAC_ADDR_FMT" is getting deleted",
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));
		/* only if peer valid is true */
		if (peer->valid)
		dp_peer_delete_wifi3((struct cdp_soc_t *)soc,
		@@ -5507,8 +5508,8 @@ static void dp_vdev_flush_peers(struct cdp_vdev *vdev_handle, bool unmap_only)
		* with ref count leak
		*/
		SET_PEER_REF_CNT_ONE(peer);
		dp_info("peer: %pM is getting unmap",
		peer->mac_addr.raw);
		dp_info("peer: "QDF_MAC_ADDR_FMT" is getting unmap",
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));
		/* free AST entries of peer */
		dp_peer_flush_ast_entry(soc, peer,
		peer_ids[i],
		@@ -5576,8 +5577,8 @@ static QDF_STATUS dp_vdev_detach_wifi3(struct cdp_soc_t *cdp_soc,
		/* check that the vdev has no peers allocated */
		if (!TAILQ_EMPTY(&vdev->peer_list)) {
		/* debug print - will be removed later */
		dp_warn("not deleting vdev object %pK (%pM) until deletion finishes for all its peers",
		vdev, vdev->mac_addr.raw);
		dp_warn("not deleting vdev object %pK ("QDF_MAC_ADDR_FMT") until deletion finishes for all its peers",
		vdev, QDF_MAC_ADDR_REF(vdev->mac_addr.raw));

		if (vdev->vdev_dp_ext_handle) {
		qdf_mem_free(vdev->vdev_dp_ext_handle);
		@@ -5631,7 +5632,8 @@ static QDF_STATUS dp_vdev_detach_wifi3(struct cdp_soc_t *cdp_soc,
		vdev->vdev_dp_ext_handle = NULL;
		}

		dp_info("deleting vdev object %pK (%pM)", vdev, vdev->mac_addr.raw);
		dp_info("deleting vdev object %pK ("QDF_MAC_ADDR_FMT")", vdev,
		QDF_MAC_ADDR_REF(vdev->mac_addr.raw));

		qdf_mem_free(vdev);

		@@ -5876,8 +5878,8 @@ dp_peer_create_wifi3(struct cdp_soc_t *soc_hdl, uint8_t vdev_id,
		/* Initialize the peer state */
		peer->state = OL_TXRX_PEER_STATE_DISC;

		dp_info("vdev %pK created peer %pK (%pM) ref_cnt: %d",
		vdev, peer, peer->mac_addr.raw,
		dp_info("vdev %pK created peer %pK ("QDF_MAC_ADDR_FMT") ref_cnt: %d",
		vdev, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		qdf_atomic_read(&peer->ref_cnt));
		/*
		* For every peer MAp message search and set if bss_peer
		@@ -6531,8 +6533,8 @@ static void dp_delete_pending_vdev(struct dp_pdev pdev, struct dp_vdev vdev,
		vdev_delete_cb = vdev->delete.callback;
		vdev_delete_context = vdev->delete.context;

		dp_info("deleting vdev object %pK (%pM)- its last peer is done",
		vdev, vdev->mac_addr.raw);
		dp_info("deleting vdev object %pK ("QDF_MAC_ADDR_FMT")- its last peer is done",
		vdev, QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
		/* all peers are gone, go ahead and delete it */
		dp_tx_flow_pool_unmap_handler(pdev, vdev_id,
		FLOW_TYPE_VDEV, vdev_id);
		@@ -6548,8 +6550,8 @@ static void dp_delete_pending_vdev(struct dp_pdev pdev, struct dp_vdev vdev,
		qdf_spin_unlock_bh(&pdev->vdev_list_lock);
		}

		dp_info("deleting vdev object %pK (%pM)",
		vdev, vdev->mac_addr.raw);
		dp_info("deleting vdev object %pK ("QDF_MAC_ADDR_FMT")",
		vdev, QDF_MAC_ADDR_REF(vdev->mac_addr.raw));
		qdf_mem_free(vdev);
		vdev = NULL;

		@@ -6599,7 +6601,8 @@ void dp_peer_unref_delete(struct dp_peer *peer)
		soc->peer_id_to_obj_map[peer_id] = NULL;

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
		"Deleting peer %pK (%pM)", peer, peer->mac_addr.raw);
		"Deleting peer %pK ("QDF_MAC_ADDR_FMT")", peer,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		/* remove the reference to the peer from the hash table */
		dp_peer_find_hash_remove(soc, peer);
		@@ -6719,14 +6722,16 @@ static QDF_STATUS dp_peer_delete_wifi3(struct cdp_soc_t *soc_hdl,

		if (!peer->valid) {
		dp_peer_unref_delete(peer);
		dp_err("Invalid peer: %pM", peer_mac);
		dp_err("Invalid peer: "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(peer_mac));
		return QDF_STATUS_E_ALREADY;
		}

		peer->valid = 0;

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
		FL("peer %pK (%pM)"), peer, peer->mac_addr.raw);
		FL("peer %pK ("QDF_MAC_ADDR_FMT")"), peer,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		dp_local_peer_id_free(peer->vdev->pdev, peer);

		@@ -8841,7 +8846,8 @@ dp_txrx_get_peer_stats_param(struct cdp_soc_t *soc, uint8_t vdev_id,

		if (!peer \|\| peer->delete_in_progress) {
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
		"Invalid Peer for Mac %pM", peer_mac);
		"Invalid Peer for Mac "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(peer_mac));
		ret = QDF_STATUS_E_FAILURE;
		} else if (type < cdp_peer_stats_max) {
		switch (type) {
		@@ -10624,7 +10630,8 @@ dp_peer_get_ref_find_by_addr(struct cdp_pdev dev, uint8_t peer_mac_addr,
		return NULL;
		}

		dp_info_rl("peer %pK mac: %pM", peer, peer->mac_addr.raw);
		dp_info_rl("peer %pK mac: "QDF_MAC_ADDR_FMT, peer,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		return peer;
		}

dp/wifi3.0/dp_peer.c

+46 −37

Original line number	Diff line number	Diff line
		@@ -514,8 +514,9 @@ static inline void dp_peer_map_ast(struct dp_soc *soc,
		}

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
		"%s: peer %pK ID %d vid %d mac %pM",
		__func__, peer, hw_peer_id, vdev_id, mac_addr);
		"%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
		__func__, peer, hw_peer_id, vdev_id,
		QDF_MAC_ADDR_REF(mac_addr));

		qdf_spin_lock_bh(&soc->ast_lock);

		@@ -636,9 +637,10 @@ int dp_peer_add_ast(struct dp_soc *soc,
		}

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
		"%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: %pM peer: %pK mac %pM",
		"%s: pdevid: %u vdev: %u ast_entry->type: %d flags: 0x%x peer_mac: "QDF_MAC_ADDR_FMT" peer: %pK mac "QDF_MAC_ADDR_FMT,
		__func__, pdev->pdev_id, vdev->vdev_id, type, flags,
		peer->mac_addr.raw, peer, mac_addr);
		QDF_MAC_ADDR_REF(peer->mac_addr.raw), peer,
		QDF_MAC_ADDR_REF(mac_addr));


		/* fw supports only 2 times the max_peers ast entries */
		@@ -998,10 +1000,11 @@ int dp_peer_update_ast(struct dp_soc soc, struct dp_peer peer,
		struct dp_peer *old_peer;

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
		"%s: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: %pM peer_mac: %pM\n",
		"%s: ast_entry->type: %d pdevid: %u vdevid: %u flags: 0x%x mac_addr: "QDF_MAC_ADDR_FMT" peer_mac: "QDF_MAC_ADDR_FMT"\n",
		__func__, ast_entry->type, peer->vdev->pdev->pdev_id,
		peer->vdev->vdev_id, flags, ast_entry->mac_addr.raw,
		peer->mac_addr.raw);
		peer->vdev->vdev_id, flags,
		QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw),
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		/* Do not send AST update in below cases
		* 1) Ast entry delete has already triggered
		@@ -1172,10 +1175,12 @@ void dp_peer_ast_send_wds_del(struct dp_soc *soc,
		struct cdp_soc_t *cdp_soc = &soc->cdp_soc;

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_TRACE,
		"%s: ast_entry->type: %d pdevid: %u vdev: %u mac_addr: %pM next_hop: %u peer_mac: %pM\n",
		"%s: ast_entry->type: %d pdevid: %u vdev: %u mac_addr: "QDF_MAC_ADDR_FMT" next_hop: %u peer_mac: "QDF_MAC_ADDR_FMT"\n",
		__func__, ast_entry->type, peer->vdev->pdev->pdev_id,
		peer->vdev->vdev_id, ast_entry->mac_addr.raw,
		ast_entry->next_hop, ast_entry->peer->mac_addr.raw);
		peer->vdev->vdev_id,
		QDF_MAC_ADDR_REF(ast_entry->mac_addr.raw),
		ast_entry->next_hop,
		QDF_MAC_ADDR_REF(ast_entry->peer->mac_addr.raw));

		if (ast_entry->next_hop) {
		cdp_soc->ol_ops->peer_del_wds_entry(soc->ctrl_psoc,
		@@ -1491,8 +1496,9 @@ static inline struct dp_peer dp_peer_find_add_id(struct dp_soc soc,
		peer = dp_peer_find_hash_find(soc, peer_mac_addr,
		0 /* is aligned */, vdev_id);
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
		"%s: peer %pK ID %d vid %d mac %pM",
		__func__, peer, peer_id, vdev_id, peer_mac_addr);
		"%s: peer %pK ID %d vid %d mac "QDF_MAC_ADDR_FMT,
		__func__, peer, peer_id, vdev_id,
		QDF_MAC_ADDR_REF(peer_mac_addr));

		if (peer) {
		/* peer's ref count was already incremented by
		@@ -1546,9 +1552,9 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
		struct dp_peer *peer = NULL;
		enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC;

		dp_info("peer_map_event (soc:%pK): peer_id %d, hw_peer_id %d, peer_mac %pM, vdev_id %d",
		dp_info("peer_map_event (soc:%pK): peer_id %d, hw_peer_id %d, peer_mac "QDF_MAC_ADDR_FMT", vdev_id %d",
		soc, peer_id, hw_peer_id,
		peer_mac_addr, vdev_id);
		QDF_MAC_ADDR_REF(peer_mac_addr), vdev_id);

		/* Peer map event for WDS ast entry get the peer from
		* obj map
		@@ -1572,9 +1578,10 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
		peer_mac_addr))
		return;

		dp_alert("AST entry not found with peer %pK peer_id %u peer_mac %pM mac_addr %pM vdev_id %u next_hop %u",
		dp_alert("AST entry not found with peer %pK peer_id %u peer_mac "QDF_MAC_ADDR_FMT" mac_addr "QDF_MAC_ADDR_FMT" vdev_id %u next_hop %u",
		peer, peer->peer_ids[0],
		peer->mac_addr.raw, peer_mac_addr, vdev_id,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		QDF_MAC_ADDR_REF(peer_mac_addr), vdev_id,
		is_wds);

		return;
		@@ -1625,8 +1632,8 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
		* referring it
		*/
		if (!peer->self_ast_entry) {
		dp_info("Add self ast from map %pM",
		peer_mac_addr);
		dp_info("Add self ast from map "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(peer_mac_addr));
		dp_peer_add_ast(soc, peer,
		peer_mac_addr,
		type, 0);
		@@ -1674,9 +1681,10 @@ dp_rx_peer_unmap_handler(struct dp_soc *soc, uint16_t peer_id,
		if (!dp_peer_ast_free_entry_by_mac(soc, peer, mac_addr))
		return;

		dp_alert("AST entry not found with peer %pK peer_id %u peer_mac %pM mac_addr %pM vdev_id %u next_hop %u",
		dp_alert("AST entry not found with peer %pK peer_id %u peer_mac "QDF_MAC_ADDR_FMT" mac_addr "QDF_MAC_ADDR_FMT" vdev_id %u next_hop %u",
		peer, peer->peer_ids[0],
		peer->mac_addr.raw, mac_addr, vdev_id,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		QDF_MAC_ADDR_REF(mac_addr), vdev_id,
		is_wds);

		return;
		@@ -1754,8 +1762,8 @@ void dp_find_peer_by_addr(struct cdp_pdev dev, uint8_t *peer_mac_addr)
		if (!peer)
		return NULL;

		dp_verbose_debug("peer %pK mac: %pM", peer,
		peer->mac_addr.raw);
		dp_verbose_debug("peer %pK mac: "QDF_MAC_ADDR_FMT, peer,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		/* ref_cnt is incremented inside dp_peer_find_hash_find().
		* Decrement it here.
		@@ -1785,8 +1793,8 @@ static bool dp_get_peer_vdev_roaming_in_progress(struct dp_peer *peer)
		is_roaming = ol_ops->is_roam_inprogress(vdev_id);
		}

		dp_info("peer: %pM, vdev_id: %d, is_roaming: %d",
		peer->mac_addr.raw, vdev_id, is_roaming);
		dp_info("peer: "QDF_MAC_ADDR_FMT", vdev_id: %d, is_roaming: %d",
		QDF_MAC_ADDR_REF(peer->mac_addr.raw), vdev_id, is_roaming);

		return is_roaming;
		}
		@@ -2696,8 +2704,8 @@ int dp_addba_resp_tx_completion_wifi3(struct cdp_soc_t *cdp_soc,
		if (!qdf_atomic_read(&peer->is_default_route_set)) {
		qdf_spin_unlock_bh(&rx_tid->tid_lock);
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_DEBUG,
		"%s: default route is not set for peer: %pM",
		__func__, peer->mac_addr.raw);
		"%s: default route is not set for peer: "QDF_MAC_ADDR_FMT,
		__func__, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
		goto fail;
		}

		@@ -3242,9 +3250,9 @@ dp_set_key_sec_type_wifi3(struct cdp_soc_t *soc, uint8_t vdev_id,
		}

		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
		"key sec spec for peer %pK %pM: %s key of type %d",
		"key sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d",
		peer,
		peer->mac_addr.raw,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		is_unicast ? "ucast" : "mcast",
		sec_type);

		@@ -3275,9 +3283,9 @@ dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
		return;
		}
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
		"sec spec for peer %pK %pM: %s key of type %d",
		"sec spec for peer %pK "QDF_MAC_ADDR_FMT": %s key of type %d",
		peer,
		peer->mac_addr.raw,
		QDF_MAC_ADDR_REF(peer->mac_addr.raw),
		is_unicast ? "ucast" : "mcast",
		sec_type);
		sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast;
		@@ -3474,7 +3482,8 @@ QDF_STATUS dp_peer_state_update(struct cdp_soc_t soc_hdl, uint8_t peer_mac,
		peer = dp_peer_find_hash_find(soc, peer_mac, 0, DP_VDEV_ALL);
		if (!peer) {
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
		"Failed to find peer for: [%pM]", peer_mac);
		"Failed to find peer for: ["QDF_MAC_ADDR_FMT"]",
		QDF_MAC_ADDR_REF(peer_mac));
		return QDF_STATUS_E_FAILURE;
		}
		peer->state = state;
		@@ -3518,16 +3527,16 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,

		if (!pdev) {
		QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
		"PDEV not found for peer_addr: %pM",
		peer_addr.bytes);
		"PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(peer_addr.bytes));
		return NULL;
		}

		peer = dp_find_peer_by_addr((struct cdp_pdev *)pdev, peer_addr.bytes);
		if (!peer) {
		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
		"PDEV not found for peer_addr: %pM",
		peer_addr.bytes);
		"PDEV not found for peer_addr: "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(peer_addr.bytes));
		return NULL;
		}

		@@ -3703,8 +3712,8 @@ bool dp_find_peer_exist_on_other_vdev(struct cdp_soc_t *soc_hdl,
		dp_pdev_to_cdp_pdev(vdev->pdev),
		dp_vdev_to_cdp_vdev(vdev),
		peer_addr)) {
		dp_err("%s: Duplicate peer %pM already exist on vdev %d",
		__func__, peer_addr, i);
		dp_err("%s: Duplicate peer "QDF_MAC_ADDR_FMT" already exist on vdev %d",
		__func__, QDF_MAC_ADDR_REF(peer_addr), i);
		return true;
		}
		}

dp/wifi3.0/dp_rx_defrag.c

+8 −8

Original line number	Diff line number	Diff line
		@@ -238,8 +238,8 @@ static void dp_rx_defrag_waitlist_add(struct dp_peer *peer, unsigned tid)
		struct dp_soc *psoc = peer->vdev->pdev->soc;
		struct dp_rx_tid *rx_reorder = &peer->rx_tid[tid];

		dp_debug("Adding TID %u to waitlist for peer %pK at MAC address %pM",
		tid, peer, peer->mac_addr.raw);
		dp_debug("Adding TID %u to waitlist for peer %pK at MAC address "QDF_MAC_ADDR_FMT,
		tid, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		/* TODO: use LIST macros instead of TAIL macros */
		qdf_spin_lock_bh(&psoc->rx.defrag.defrag_lock);
		@@ -267,8 +267,8 @@ void dp_rx_defrag_waitlist_remove(struct dp_peer *peer, unsigned tid)
		struct dp_rx_tid *rx_reorder;
		struct dp_rx_tid *tmp;

		dp_debug("Removing TID %u to waitlist for peer %pK at MAC address %pM",
		tid, peer, peer->mac_addr.raw);
		dp_debug("Removing TID %u to waitlist for peer %pK at MAC address "QDF_MAC_ADDR_FMT,
		tid, peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		if (tid >= DP_MAX_TIDS) {
		dp_err("TID out of bounds: %d", tid);
		@@ -1523,8 +1523,8 @@ void dp_rx_defrag_cleanup(struct dp_peer *peer, unsigned tid)
		rx_reorder_array_elem->head = NULL;
		rx_reorder_array_elem->tail = NULL;
		} else {
		dp_info("Cleanup self peer %pK and TID %u at MAC address %pM",
		peer, tid, peer->mac_addr.raw);
		dp_info("Cleanup self peer %pK and TID %u at MAC address "QDF_MAC_ADDR_FMT,
		peer, tid, QDF_MAC_ADDR_REF(peer->mac_addr.raw));
		}

		/* Free up saved ring descriptors */
		@@ -1949,9 +1949,9 @@ QDF_STATUS dp_rx_defrag_add_last_frag(struct dp_soc *soc,
		*/
		if (!rx_reorder_array_elem) {
		dp_verbose_debug(
		"peer id:%d mac: %pM drop rx frame!",
		"peer id:%d mac: "QDF_MAC_ADDR_FMT" drop rx frame!",
		peer->peer_ids[0],
		peer->mac_addr.raw);
		QDF_MAC_ADDR_REF(peer->mac_addr.raw));
		DP_STATS_INC(soc, rx.err.defrag_peer_uninit, 1);
		qdf_nbuf_free(nbuf);
		goto fail;

dp/wifi3.0/dp_rx_err.c

+7 −6

Original line number	Diff line number	Diff line
		@@ -133,8 +133,9 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc,
		qdf_spin_unlock_bh(&soc->ast_lock);
		QDF_TRACE(QDF_MODULE_ID_DP,
		QDF_TRACE_LEVEL_INFO,
		"Detected DBDC Root AP %pM, %d %d",
		&data[QDF_MAC_ADDR_SIZE], vdev->pdev->pdev_id,
		"Detected DBDC Root AP "QDF_MAC_ADDR_FMT", %d %d",
		QDF_MAC_ADDR_REF(&data[QDF_MAC_ADDR_SIZE]),
		vdev->pdev->pdev_id,
		ase->pdev_id);
		return false;
		}
		@@ -144,8 +145,8 @@ static inline bool dp_rx_mcast_echo_check(struct dp_soc *soc,
		qdf_spin_unlock_bh(&soc->ast_lock);
		QDF_TRACE(QDF_MODULE_ID_DP,
		QDF_TRACE_LEVEL_INFO,
		"received pkt with same src mac %pM",
		&data[QDF_MAC_ADDR_SIZE]);
		"received pkt with same src mac "QDF_MAC_ADDR_FMT,
		QDF_MAC_ADDR_REF(&data[QDF_MAC_ADDR_SIZE]));

		return true;
		}
		@@ -387,8 +388,8 @@ dp_rx_pn_error_handle(struct dp_soc *soc, hal_ring_desc_t ring_desc,
		* TODO: Check for peer specific policies & set peer_pn_policy
		*/
		QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
		"discard rx due to PN error for peer %pK %pM",
		peer, peer->mac_addr.raw);
		"discard rx due to PN error for peer %pK "QDF_MAC_ADDR_FMT,
		peer, QDF_MAC_ADDR_REF(peer->mac_addr.raw));

		dp_peer_unref_del_find_by_id(peer);
		}