diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2022-05-19 16:29:13 +0200 |
|---|---|---|
| committer | Philippe Schenker <philippe.schenker@toradex.com> | 2022-05-19 16:29:13 +0200 |
| commit | e6fb5c32f78f99682821f91b3959e222c93e4cb9 (patch) | |
| tree | 3f6c281a7d83a6e3c0a153f93718f7cd9a39b6f7 /net/core/dev.c | |
| parent | 585dc27c53b6c1a32a7e11b724e91d7297388a13 (diff) | |
| parent | b7007e1d615b8d4b71c28ebf790c5164fc4491d5 (diff) | |
Merge remote-tracking branch 'gh-fslc/5.4-2.3.x-imx' into toradex_5.4-2.3.x-imx
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index ff336417c9b9..a03036456221 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3766,7 +3766,10 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) if (dev->flags & IFF_UP) { int cpu = smp_processor_id(); /* ok because BHs are off */ - if (txq->xmit_lock_owner != cpu) { + /* Other cpus might concurrently change txq->xmit_lock_owner + * to -1 or to their cpu id, but not to our id. + */ + if (READ_ONCE(txq->xmit_lock_owner) != cpu) { if (dev_xmit_recursion()) goto recursion_alert; |