diff options
| author | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-06-09 18:26:55 +0200 |
|---|---|---|
| committer | Thomas Hellström <thomas.hellstrom@linux.intel.com> | 2025-06-09 18:54:05 +0200 |
| commit | 86e2d052c2320bf12571a5d96b16c2745e1cfc5e (patch) | |
| tree | ddd7e116a07fc3126c1941a46c74257a0adae333 /include/net/netdev_rx_queue.h | |
| parent | drm/xe: GSM size should be constant on most platforms (diff) | |
| parent | Linux 6.16-rc1 (diff) | |
| download | linux-86e2d052c2320bf12571a5d96b16c2745e1cfc5e.tar.gz linux-86e2d052c2320bf12571a5d96b16c2745e1cfc5e.zip | |
Merge drm/drm-next into drm-xe-next
Backmerging to bring in 6.16
Signed-off-by: Thomas Hellström <thomas.hellstrom@linux.intel.com>
Diffstat (limited to 'include/net/netdev_rx_queue.h')
| -rw-r--r-- | include/net/netdev_rx_queue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h index b2238b551dce..8cdcd138b33f 100644 --- a/include/net/netdev_rx_queue.h +++ b/include/net/netdev_rx_queue.h @@ -20,12 +20,12 @@ struct netdev_rx_queue { struct net_device *dev; netdevice_tracker dev_tracker; + /* All fields below are "ops protected", + * see comment about net_device::lock + */ #ifdef CONFIG_XDP_SOCKETS struct xsk_buff_pool *pool; #endif - /* NAPI instance for the queue - * "ops protected", see comment about net_device::lock - */ struct napi_struct *napi; struct pp_memory_provider_params mp_params; } ____cacheline_aligned_in_smp; |