diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 11:44:20 -0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-17 11:44:20 -0800 |
| commit | 6b5567b1b21b0efc544b154dc023b7dd4b4dcf4c (patch) | |
| tree | 49737aa9d6b50154c37ac9b2d6f6021b9eab61c1 /include/linux/netdevice.h | |
| parent | be6b41c15dc09c067492bd23668763f551747e4e (diff) | |
| parent | 8b97cae315cafd7debf3601f88621e2aa8956ef3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
No conflicts.
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
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 e99db8341da5..93fc680b658f 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -2160,7 +2160,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; |