diff options
| author | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
|---|---|---|
| committer | Rodrigo Vivi <rodrigo.vivi@intel.com> | 2022-03-02 11:28:33 -0500 |
| commit | 230bc2bed518632602bd2cdad6ba5d2081d448b5 (patch) | |
| tree | f08bf885fe7d2a81939d74e3051a8cc8185c4915 /include/linux/netdevice.h | |
| parent | 17003d109e6cd08d4db5f6525a1023537ce6c743 (diff) | |
| parent | 38a15ad9488e21cad8f42d3befca20f91e5b2874 (diff) | |
Merge drm/drm-next into drm-intel-next
To catch up with recent rounds of pull requests
and get some drm-misc dependencies so we can merge
linux/string_helpers related changes.
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index e490b84732d1..8b5a314db167 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2158,7 +2158,7 @@ struct net_device { struct netdev_queue *_tx ____cacheline_aligned_in_smp; unsigned int num_tx_queues; unsigned int real_num_tx_queues; - struct Qdisc *qdisc; + struct Qdisc __rcu *qdisc; unsigned int tx_queue_len; spinlock_t tx_global_lock; |