Skip to content

Commit 922d207

Browse files
sachinthegreenkartben
sachinthegreen
authored and
kartben
committed
drivers: nrf_wifi: Use mode specific data structures
Update the driver to use the updated mode specific data structure names. Signed-off-by: Sachin D Kulkarni <[email protected]>
1 parent d9f40b4 commit 922d207

File tree

3 files changed

+64
-64
lines changed

3 files changed

+64
-64
lines changed

‎drivers/wifi/nrf_wifi/src/fmac_main.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -781,18 +781,18 @@ static int nrf_wifi_drv_main_zep(const struct device *dev)
781781
}
782782

783783
#ifdef CONFIG_NRF70_DATA_TX
784-
struct nrf_wifi_fmac_priv_def *def_priv = NULL;
784+
struct nrf_wifi_sys_fmac_priv *sys_fpriv = NULL;
785785

786-
def_priv = wifi_fmac_priv(rpu_drv_priv_zep.fmac_priv);
787-
def_priv->max_ampdu_len_per_token =
786+
sys_fpriv = wifi_fmac_priv(rpu_drv_priv_zep.fmac_priv);
787+
sys_fpriv->max_ampdu_len_per_token =
788788
(RPU_PKTRAM_SIZE - (CONFIG_NRF70_RX_NUM_BUFS * CONFIG_NRF70_RX_MAX_DATA_SIZE)) /
789789
CONFIG_NRF70_MAX_TX_TOKENS;
790790
/* Align to 4-byte */
791-
def_priv->max_ampdu_len_per_token &= ~0x3;
791+
sys_fpriv->max_ampdu_len_per_token &= ~0x3;
792792

793793
/* Alignment overhead for size based coalesce */
794-
def_priv->avail_ampdu_len_per_token =
795-
def_priv->max_ampdu_len_per_token -
794+
sys_fpriv->avail_ampdu_len_per_token =
795+
sys_fpriv->max_ampdu_len_per_token -
796796
(MAX_PKT_RAM_TX_ALIGN_OVERHEAD * max_tx_aggregation);
797797
#endif /* CONFIG_NRF70_DATA_TX */
798798

‎drivers/wifi/nrf_wifi/src/net_if.c‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,
178178
{
179179
struct nrf_wifi_fmac_vif_ctx *vif_ctx = vif_ctx_handle;
180180
struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
181-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
181+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
182182
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
183183

184184
if (!vif_ctx) {
@@ -188,9 +188,9 @@ void nrf_wifi_rpu_recovery_cb(void *vif_ctx_handle,
188188
}
189189

190190
fmac_dev_ctx = vif_ctx->fmac_dev_ctx;
191-
def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
192-
if (!def_dev_ctx) {
193-
LOG_ERR("%s: def_dev_ctx is NULL",
191+
sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
192+
if (!sys_dev_ctx) {
193+
LOG_ERR("%s: sys_dev_ctx is NULL",
194194
__func__);
195195
goto out;
196196
}
@@ -238,10 +238,10 @@ void nrf_wifi_if_sniffer_rx_frm(void *os_vif_ctx, void *frm,
238238
struct net_pkt *pkt;
239239
struct nrf_wifi_ctx_zep *rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
240240
struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
241-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
241+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
242242
int ret;
243243

244-
def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
244+
sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
245245

246246
pkt = net_raw_pkt_from_nbuf(iface, frm, sizeof(struct raw_rx_pkt_header),
247247
raw_rx_hdr,
@@ -269,11 +269,11 @@ void nrf_wifi_if_rx_frm(void *os_vif_ctx, void *frm)
269269
int status;
270270
struct nrf_wifi_ctx_zep *rpu_ctx_zep = vif_ctx_zep->rpu_ctx_zep;
271271
struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
272-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
272+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
273273
struct rpu_host_stats *host_stats = NULL;
274274

275-
def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
276-
host_stats = &def_dev_ctx->host_stats;
275+
sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
276+
host_stats = &sys_dev_ctx->host_stats;
277277
host_stats->total_rx_pkts++;
278278

279279
pkt = net_pkt_from_nbuf(iface, frm);
@@ -356,7 +356,7 @@ int nrf_wifi_if_send(const struct device *dev,
356356
#ifdef CONFIG_NRF70_DATA_TX
357357
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
358358
struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
359-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
359+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
360360
struct rpu_host_stats *host_stats = NULL;
361361
void *nbuf = NULL;
362362

@@ -383,8 +383,8 @@ int nrf_wifi_if_send(const struct device *dev,
383383
goto unlock;
384384
}
385385

386-
def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
387-
host_stats = &def_dev_ctx->host_stats;
386+
sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
387+
host_stats = &sys_dev_ctx->host_stats;
388388
nbuf = net_pkt_to_nbuf(pkt);
389389
if (!nbuf) {
390390
LOG_DBG("Failed to allocate net_pkt");
@@ -951,7 +951,7 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
951951
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
952952
struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
953953
struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
954-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
954+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
955955

956956
if (!dev || !config) {
957957
LOG_ERR("%s: Invalid parameters",
@@ -979,9 +979,9 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
979979
goto unlock;
980980
}
981981
fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
982-
def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
983-
if (!def_dev_ctx) {
984-
LOG_ERR("%s: def_dev_ctx is NULL",
982+
sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
983+
if (!sys_dev_ctx) {
984+
LOG_ERR("%s: sys_dev_ctx is NULL",
985985
__func__);
986986
goto unlock;
987987
}
@@ -990,7 +990,7 @@ int nrf_wifi_if_get_config_zep(const struct device *dev,
990990

991991
if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
992992
config->txinjection_mode =
993-
def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
993+
sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode;
994994
}
995995
#ifdef CONFIG_NRF70_TCP_IP_CHECKSUM_OFFLOAD
996996
if (type == ETHERNET_CONFIG_TYPE_TX_CHECKSUM_SUPPORT ||
@@ -1018,7 +1018,7 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
10181018
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
10191019
struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
10201020
struct nrf_wifi_fmac_dev_ctx *fmac_dev_ctx = NULL;
1021-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
1021+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
10221022
int ret = -1;
10231023

10241024
if (!dev) {
@@ -1067,9 +1067,9 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
10671067
}
10681068

10691069
fmac_dev_ctx = rpu_ctx_zep->rpu_ctx;
1070-
def_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
1071-
if (!def_dev_ctx) {
1072-
LOG_ERR("%s: def_dev_ctx is NULL",
1070+
sys_dev_ctx = wifi_dev_priv(fmac_dev_ctx);
1071+
if (!sys_dev_ctx) {
1072+
LOG_ERR("%s: sys_dev_ctx is NULL",
10731073
__func__);
10741074
goto unlock;
10751075
}
@@ -1078,7 +1078,7 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
10781078
if (type == ETHERNET_CONFIG_TYPE_TXINJECTION_MODE) {
10791079
unsigned char mode;
10801080

1081-
if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode ==
1081+
if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->txinjection_mode ==
10821082
config->txinjection_mode) {
10831083
LOG_INF("%s: Driver TX injection setting is same as configured setting",
10841084
__func__);
@@ -1091,10 +1091,10 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
10911091
* as is
10921092
*/
10931093
if (config->txinjection_mode) {
1094-
mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
1094+
mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
10951095
(NRF_WIFI_TX_INJECTION_MODE);
10961096
} else {
1097-
mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
1097+
mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
10981098
(NRF_WIFI_TX_INJECTION_MODE);
10991099
}
11001100

@@ -1111,18 +1111,18 @@ int nrf_wifi_if_set_config_zep(const struct device *dev,
11111111
else if (type == ETHERNET_CONFIG_TYPE_PROMISC_MODE) {
11121112
unsigned char mode;
11131113

1114-
if (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode ==
1114+
if (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->promisc_mode ==
11151115
config->promisc_mode) {
11161116
LOG_ERR("%s: Driver promisc mode setting is same as configured setting",
11171117
__func__);
11181118
goto out;
11191119
}
11201120

11211121
if (config->promisc_mode) {
1122-
mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
1122+
mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) |
11231123
(NRF_WIFI_PROMISCUOUS_MODE);
11241124
} else {
1125-
mode = (def_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
1125+
mode = (sys_dev_ctx->vif_ctx[vif_ctx_zep->vif_idx]->mode) ^
11261126
(NRF_WIFI_PROMISCUOUS_MODE);
11271127
}
11281128

@@ -1171,7 +1171,7 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
11711171
struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
11721172
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
11731173
#ifdef CONFIG_NRF70_RAW_DATA_TX
1174-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
1174+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
11751175
#endif /* CONFIG_NRF70_RAW_DATA_TX */
11761176
struct rpu_op_stats stats;
11771177
int ret = -1;
@@ -1229,8 +1229,8 @@ int nrf_wifi_stats_get(const struct device *dev, struct net_stats_wifi *zstats)
12291229
zstats->overrun_count = stats.host.total_tx_drop_pkts + stats.host.total_rx_drop_pkts;
12301230

12311231
#ifdef CONFIG_NRF70_RAW_DATA_TX
1232-
def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
1233-
zstats->errors.tx += def_dev_ctx->raw_pkt_stats.raw_pkt_send_failure;
1232+
sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
1233+
zstats->errors.tx += sys_dev_ctx->raw_pkt_stats.raw_pkt_send_failure;
12341234
#endif /* CONFIG_NRF70_RAW_DATA_TX */
12351235
ret = 0;
12361236
unlock:
@@ -1244,7 +1244,7 @@ int nrf_wifi_stats_reset(const struct device *dev)
12441244
enum nrf_wifi_status status = NRF_WIFI_STATUS_FAIL;
12451245
struct nrf_wifi_ctx_zep *rpu_ctx_zep = NULL;
12461246
struct nrf_wifi_vif_ctx_zep *vif_ctx_zep = NULL;
1247-
struct nrf_wifi_fmac_dev_ctx_def *def_dev_ctx = NULL;
1247+
struct nrf_wifi_sys_fmac_dev_ctx *sys_dev_ctx = NULL;
12481248
int ret = -1;
12491249

12501250
if (!dev) {
@@ -1277,8 +1277,8 @@ int nrf_wifi_stats_reset(const struct device *dev)
12771277
goto unlock;
12781278
}
12791279

1280-
def_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
1281-
memset(&def_dev_ctx->host_stats, 0, sizeof(struct rpu_host_stats));
1280+
sys_dev_ctx = wifi_dev_priv(rpu_ctx_zep->rpu_ctx);
1281+
memset(&sys_dev_ctx->host_stats, 0, sizeof(struct rpu_host_stats));
12821282

12831283
ret = 0;
12841284
unlock:

0 commit comments

Comments
 (0)