From 5e3c20acf4f9764921362926f58cf4ab1dfae8f8 Mon Sep 17 00:00:00 2001 From: Rakshith Suresh Patkar Date: Wed, 21 Aug 2019 13:20:04 +0530 Subject: [PATCH] qcacmn: Remove peer local id from qdf_nbuf_cb Local peer_id is being cleaned up across DP, HDD and PS/WMA. So, any references to local peer_id/sta_id will be replaced by peer mac address and all interactions between the layers will be based on peer mac address. This change removes peer_local id from qdf_nbuf_cb and is replaced by vdev_id. Add accessor macro QDF_NBUF_CB_RX_VDEV_ID and wrapper API qdf_nbuf_cb_update_vdev_id. Change-Id: I56085eec60df1cfd78b613d8a244063a677358d4 CRs-Fixed: 2512703 --- qdf/linux/src/i_qdf_nbuf.h | 5 +++-- qdf/linux/src/i_qdf_nbuf_m.h | 18 +++++++++--------- qdf/linux/src/i_qdf_nbuf_w.h | 10 +++++----- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/qdf/linux/src/i_qdf_nbuf.h b/qdf/linux/src/i_qdf_nbuf.h index 9ca1af3fd415..90bd8514310c 100644 --- a/qdf/linux/src/i_qdf_nbuf.h +++ b/qdf/linux/src/i_qdf_nbuf.h @@ -110,7 +110,7 @@ typedef union { * @rx.dev.priv_cb_m.dp.wifi3.msdu_len: length of RX packet * @rx.dev.priv_cb_m.dp.wifi3.peer_id: peer_id for RX packet * @rx.dev.priv_cb_m.dp.wifi2.map_index: - * @rx.dev.priv_cb_m.peer_local_id: peer_local_id for RX pkt + * @rx.dev.priv_cb_m.vdev_id: vdev_id for RX pkt * @rx.dev.priv_cb_m.ipa_owned: packet owned by IPA * * @rx.lro_eligible: flag to indicate whether the MSDU is LRO eligible @@ -220,7 +220,8 @@ struct qdf_nbuf_cb { */ uint32_t ipa_owned:1, reserved:15, - peer_local_id:16; + vdev_id:8, + reserved1:8; uint32_t tcp_seq_num; uint32_t tcp_ack_num; union { diff --git a/qdf/linux/src/i_qdf_nbuf_m.h b/qdf/linux/src/i_qdf_nbuf_m.h index a83f61cf5369..296494c8aca9 100644 --- a/qdf/linux/src/i_qdf_nbuf_m.h +++ b/qdf/linux/src/i_qdf_nbuf_m.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014-2018 The Linux Foundation. All rights reserved. + * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved. * * Permission to use, copy, modify, and/or distribute this software for * any purpose with or without fee is hereby granted, provided that the @@ -34,8 +34,8 @@ #define QDF_NBUF_CB_RX_LRO_CTX(skb) \ (((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m.lro_ctx) -#define QDF_NBUF_CB_RX_PEER_LOCAL_ID(skb) \ - (((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m.peer_local_id) +#define QDF_NBUF_CB_RX_VDEV_ID(skb) \ + (((struct qdf_nbuf_cb *)((skb)->cb))->u.rx.dev.priv_cb_m.vdev_id) #define QDF_NBUF_CB_TX_IPA_OWNED(skb) \ (((struct qdf_nbuf_cb *)((skb)->cb))->u.tx.dev.priv_cb_m.ipa.owned) @@ -77,16 +77,16 @@ (QDF_NBUF_CB_TX_IPA_PRIV(skb) = (priv)) /** - * qdf_nbuf_cb_update_peer_local_id() - update peer local id in skb cb - * @skb: skb pointer whose cb is updated with peer local id information - * @peer_local_id: peer local id to be update in cb + * qdf_nbuf_cb_update_vdev_id() - update vdev id in skb cb + * @skb: skb pointer whose cb is updated with vdev id information + * @vdev_id: vdev id to be updated in cb * * Return: void */ -static inline void qdf_nbuf_cb_update_peer_local_id(struct sk_buff *skb, - uint16_t peer_local_id) +static inline void +qdf_nbuf_cb_update_vdev_id(struct sk_buff *skb, uint8_t vdev_id) { - QDF_NBUF_CB_RX_PEER_LOCAL_ID(skb) = peer_local_id; + QDF_NBUF_CB_RX_VDEV_ID(skb) = vdev_id; } void __qdf_nbuf_init_replenish_timer(void); diff --git a/qdf/linux/src/i_qdf_nbuf_w.h b/qdf/linux/src/i_qdf_nbuf_w.h index 4fbc43440bee..4657186c7158 100644 --- a/qdf/linux/src/i_qdf_nbuf_w.h +++ b/qdf/linux/src/i_qdf_nbuf_w.h @@ -93,14 +93,14 @@ (QDF_NBUF_CB_RX_FLOW_TAG((skb))) /** - * qdf_nbuf_cb_update_peer_local_id() - update peer local id in skb cb - * @skb: skb pointer whose cb is updated with peer local id information - * @peer_local_id: peer local id to be update in cb + * qdf_nbuf_cb_update_vdev_id() - update vdev id in skb cb + * @skb: skb pointer whose cb is updated with vdev id information + * @vdev_id: vdev id to be updated in cb * * Return: void */ -static inline void qdf_nbuf_cb_update_peer_local_id(struct sk_buff *skb, - uint16_t peer_local_id) +static inline void +qdf_nbuf_cb_update_vdev_id(struct sk_buff *skb, uint8_t vdev_id) { /* Does not apply to WIN */ }