Commit 57738dab authored by Breno Leitao's avatar Breno Leitao Committed by David S. Miller

wifi: ath10k: allocate dummy net_device dynamically

Embedding net_device into structures prohibits the usage of flexible
arrays in the net_device structure. For more details, see the discussion
at [1].

Un-embed the net_device from struct ath10k by converting it
into a pointer. Then use the leverage alloc_netdev() to allocate the
net_device object at ath10k_core_create(). The free of the device occurs
at ath10k_core_destroy().

[1] https://lore.kernel.org/all/20240229225910.79e224cf@kernel.org/Signed-off-by: default avatarBreno Leitao <leitao@debian.org>
Acked-by: default avatarKalle Valo <kvalo@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4a8b77ef
...@@ -3673,11 +3673,13 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, ...@@ -3673,11 +3673,13 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
INIT_WORK(&ar->set_coverage_class_work, INIT_WORK(&ar->set_coverage_class_work,
ath10k_core_set_coverage_class_work); ath10k_core_set_coverage_class_work);
init_dummy_netdev(&ar->napi_dev); ar->napi_dev = alloc_netdev_dummy(0);
if (!ar->napi_dev)
goto err_free_tx_complete;
ret = ath10k_coredump_create(ar); ret = ath10k_coredump_create(ar);
if (ret) if (ret)
goto err_free_tx_complete; goto err_free_netdev;
ret = ath10k_debug_create(ar); ret = ath10k_debug_create(ar);
if (ret) if (ret)
...@@ -3687,6 +3689,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, ...@@ -3687,6 +3689,8 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,
err_free_coredump: err_free_coredump:
ath10k_coredump_destroy(ar); ath10k_coredump_destroy(ar);
err_free_netdev:
free_netdev(ar->napi_dev);
err_free_tx_complete: err_free_tx_complete:
destroy_workqueue(ar->workqueue_tx_complete); destroy_workqueue(ar->workqueue_tx_complete);
err_free_aux_wq: err_free_aux_wq:
...@@ -3708,6 +3712,7 @@ void ath10k_core_destroy(struct ath10k *ar) ...@@ -3708,6 +3712,7 @@ void ath10k_core_destroy(struct ath10k *ar)
destroy_workqueue(ar->workqueue_tx_complete); destroy_workqueue(ar->workqueue_tx_complete);
free_netdev(ar->napi_dev);
ath10k_debug_destroy(ar); ath10k_debug_destroy(ar);
ath10k_coredump_destroy(ar); ath10k_coredump_destroy(ar);
ath10k_htt_tx_destroy(&ar->htt); ath10k_htt_tx_destroy(&ar->htt);
......
...@@ -1269,7 +1269,7 @@ struct ath10k { ...@@ -1269,7 +1269,7 @@ struct ath10k {
struct ath10k_per_peer_tx_stats peer_tx_stats; struct ath10k_per_peer_tx_stats peer_tx_stats;
/* NAPI */ /* NAPI */
struct net_device napi_dev; struct net_device *napi_dev;
struct napi_struct napi; struct napi_struct napi;
struct work_struct set_coverage_class_work; struct work_struct set_coverage_class_work;
......
...@@ -3217,7 +3217,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar) ...@@ -3217,7 +3217,7 @@ static void ath10k_pci_free_irq(struct ath10k *ar)
void ath10k_pci_init_napi(struct ath10k *ar) void ath10k_pci_init_napi(struct ath10k *ar)
{ {
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll); netif_napi_add(ar->napi_dev, &ar->napi, ath10k_pci_napi_poll);
} }
static int ath10k_pci_init_irq(struct ath10k *ar) static int ath10k_pci_init_irq(struct ath10k *ar)
......
...@@ -2532,7 +2532,7 @@ static int ath10k_sdio_probe(struct sdio_func *func, ...@@ -2532,7 +2532,7 @@ static int ath10k_sdio_probe(struct sdio_func *func,
return -ENOMEM; return -ENOMEM;
} }
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll); netif_napi_add(ar->napi_dev, &ar->napi, ath10k_sdio_napi_poll);
ath10k_dbg(ar, ATH10K_DBG_BOOT, ath10k_dbg(ar, ATH10K_DBG_BOOT,
"sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n", "sdio new func %d vendor 0x%x device 0x%x block 0x%x/0x%x\n",
......
...@@ -935,7 +935,7 @@ static int ath10k_snoc_hif_start(struct ath10k *ar) ...@@ -935,7 +935,7 @@ static int ath10k_snoc_hif_start(struct ath10k *ar)
bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX); bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX);
dev_set_threaded(&ar->napi_dev, true); dev_set_threaded(ar->napi_dev, true);
ath10k_core_napi_enable(ar); ath10k_core_napi_enable(ar);
ath10k_snoc_irq_enable(ar); ath10k_snoc_irq_enable(ar);
ath10k_snoc_rx_post(ar); ath10k_snoc_rx_post(ar);
...@@ -1253,7 +1253,7 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget) ...@@ -1253,7 +1253,7 @@ static int ath10k_snoc_napi_poll(struct napi_struct *ctx, int budget)
static void ath10k_snoc_init_napi(struct ath10k *ar) static void ath10k_snoc_init_napi(struct ath10k *ar)
{ {
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll); netif_napi_add(ar->napi_dev, &ar->napi, ath10k_snoc_napi_poll);
} }
static int ath10k_snoc_request_irq(struct ath10k *ar) static int ath10k_snoc_request_irq(struct ath10k *ar)
......
...@@ -1014,7 +1014,7 @@ static int ath10k_usb_probe(struct usb_interface *interface, ...@@ -1014,7 +1014,7 @@ static int ath10k_usb_probe(struct usb_interface *interface,
return -ENOMEM; return -ENOMEM;
} }
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_usb_napi_poll); netif_napi_add(ar->napi_dev, &ar->napi, ath10k_usb_napi_poll);
usb_get_dev(dev); usb_get_dev(dev);
vendor_id = le16_to_cpu(dev->descriptor.idVendor); vendor_id = le16_to_cpu(dev->descriptor.idVendor);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment