diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-08-15 15:01:26 +0200 |
| commit | a35762dd14adb952442e487d8dad4bb50b614b2b (patch) | |
| tree | 4d21de11837f293860db8abbea8db161f1018edb /net/ipv4/raw.c | |
| parent | iommufd/selftest: Make the mock iommu driver into a real driver (diff) | |
| parent | Linux 6.5-rc6 (diff) | |
| download | linux-a35762dd14adb952442e487d8dad4bb50b614b2b.tar.xz linux-a35762dd14adb952442e487d8dad4bb50b614b2b.zip | |
Merge tag 'v6.5-rc6' into iommufd for-next
Required for following patches.
Resolve merge conflict by using the hunk from the for-next branch and
shifting the iommufd_object_deref_user() into iommufd_hw_pagetable_put()
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'net/ipv4/raw.c')
| -rw-r--r-- | net/ipv4/raw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c index 7782ff5e6539..cb381f5aa464 100644 --- a/net/ipv4/raw.c +++ b/net/ipv4/raw.c @@ -348,7 +348,7 @@ static int raw_send_hdrinc(struct sock *sk, struct flowi4 *fl4, goto error; skb_reserve(skb, hlen); - skb->priority = sk->sk_priority; + skb->priority = READ_ONCE(sk->sk_priority); skb->mark = sockc->mark; skb->tstamp = sockc->transmit_time; skb_dst_set(skb, &rt->dst); |