samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
派生 0
代码 工单 合并请求 工作流 软件包 项目 发布 百科 活动

qcacmn: Update MAC address format dp

浏览代码 
Updating MAC Address format in dp

Change-Id: I9e855d4081a5c5eadd69945d94596a699e2c2cd1
CRs-Fixed: 2599241
这个提交包含在：
Shivani Soni
2020-01-08 16:42:08 +05:30
提交者 nshrivas
父节点 22434e5ebd
当前提交 a5707a4ded
共修改 3 个文件，包含 17 行新增和 28 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件

33
dp/wifi3.0/dp_peer.c
查看文件

@@ -486,10 +486,8 @@ static inline void dp_peer_map_ast(struct dp_soc *soc,
} }
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %02x:%02x:%02x:%02x:%02x:%02x", "%s: peer %pK ID %d vid %d mac %pM",
__func__, peer, hw_peer_id, vdev_id, mac_addr[0], __func__, peer, hw_peer_id, vdev_id, mac_addr);
mac_addr[1], mac_addr[2], mac_addr[3],
mac_addr[4], mac_addr[5]);
qdf_spin_lock_bh(&soc->ast_lock); qdf_spin_lock_bh(&soc->ast_lock);
@@ -1428,10 +1426,8 @@ static inline struct dp_peer *dp_peer_find_add_id(struct dp_soc *soc,
peer = dp_peer_find_hash_find(soc, peer_mac_addr, peer = dp_peer_find_hash_find(soc, peer_mac_addr,
0 /* is aligned */, vdev_id); 0 /* is aligned */, vdev_id);
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_ERROR,
"%s: peer %pK ID %d vid %d mac %02x:%02x:%02x:%02x:%02x:%02x", "%s: peer %pK ID %d vid %d mac %pM",
__func__, peer, peer_id, vdev_id, peer_mac_addr[0], __func__, peer, peer_id, vdev_id, peer_mac_addr);
peer_mac_addr[1], peer_mac_addr[2], peer_mac_addr[3],
peer_mac_addr[4], peer_mac_addr[5]);
if (peer) { if (peer) {
/* peer's ref count was already incremented by /* peer's ref count was already incremented by
@@ -1485,10 +1481,9 @@ dp_rx_peer_map_handler(struct dp_soc *soc, uint16_t peer_id,
struct dp_peer *peer = NULL; struct dp_peer *peer = NULL;
enum cdp_txrx_ast_entry_type type = CDP_TXRX_AST_TYPE_STATIC; 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 %02x:%02x:%02x:%02x:%02x:%02x, vdev_id %d", dp_info("peer_map_event (soc:%pK): peer_id %d, hw_peer_id %d, peer_mac %pM, vdev_id %d",
soc, peer_id, hw_peer_id, peer_mac_addr[0], peer_mac_addr[1], soc, peer_id, hw_peer_id,
peer_mac_addr[2], peer_mac_addr[3], peer_mac_addr[4], peer_mac_addr, vdev_id);
peer_mac_addr[5], vdev_id);
/* Peer map event for WDS ast entry get the peer from /* Peer map event for WDS ast entry get the peer from
* obj map * obj map
@@ -3069,11 +3064,9 @@ dp_rx_sec_ind_handler(struct dp_soc *soc, uint16_t peer_id,
return; return;
} }
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"sec spec for peer %pK (%02x:%02x:%02x:%02x:%02x:%02x): %s key of type %d", "sec spec for peer %pK %pM: %s key of type %d",
peer, peer,
peer->mac_addr.raw[0], peer->mac_addr.raw[1], peer->mac_addr.raw,
peer->mac_addr.raw[2], peer->mac_addr.raw[3],
peer->mac_addr.raw[4], peer->mac_addr.raw[5],
is_unicast ? "ucast" : "mcast", is_unicast ? "ucast" : "mcast",
sec_type); sec_type);
sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast; sec_index = is_unicast ? dp_sec_ucast : dp_sec_mcast;
@@ -3260,16 +3253,16 @@ dp_get_vdev_by_peer_addr(struct cdp_pdev *pdev_handle,
if (!pdev) { if (!pdev) {
QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_DP, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr: " QDF_MAC_ADDR_STR, "PDEV not found for peer_addr: %pM",
QDF_MAC_ADDR_ARRAY(peer_addr.bytes)); peer_addr.bytes);
return NULL; return NULL;
} }
peer = dp_find_peer_by_addr((struct cdp_pdev *)pdev, peer_addr.bytes); peer = dp_find_peer_by_addr((struct cdp_pdev *)pdev, peer_addr.bytes);
if (!peer) { if (!peer) {
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_INFO_HIGH,
"PDEV not found for peer_addr:" QDF_MAC_ADDR_STR, "PDEV not found for peer_addr: %pM",
QDF_MAC_ADDR_ARRAY(peer_addr.bytes)); peer_addr.bytes);
return NULL; return NULL;
} }

4
dp/wifi3.0/dp_rx_defrag.c
查看文件

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

8
dp/wifi3.0/dp_rx_err.c
查看文件

@@ -355,12 +355,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 * TODO: Check for peer specific policies & set peer_pn_policy
*/ */
QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR, QDF_TRACE(QDF_MODULE_ID_TXRX, QDF_TRACE_LEVEL_ERROR,
"discard rx due to PN error for peer %pK " "discard rx due to PN error for peer %pK %pM",
"(%02x:%02x:%02x:%02x:%02x:%02x)", peer, peer->mac_addr.raw);
peer,
peer->mac_addr.raw[0], peer->mac_addr.raw[1],
peer->mac_addr.raw[2], peer->mac_addr.raw[3],
peer->mac_addr.raw[4], peer->mac_addr.raw[5]);
dp_peer_unref_del_find_by_id(peer); dp_peer_unref_del_find_by_id(peer);
} }