diff options
| author | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
|---|---|---|
| committer | Russell King (Oracle) <rmk+kernel@armlinux.org.uk> | 2024-03-26 12:08:35 +0000 |
| commit | f843bc9bc952bdeb21586ee921d29f5c2ae5a863 (patch) | |
| tree | 05daf639c7add0e0fcb94f65143f10d7d87bd0b5 /include/net/udplite.h | |
| parent | 3c688a55831db128cc709396992886396d4f1654 (diff) | |
| parent | 3d5a640ecf92e4c8d6e157849217b68984a819bc (diff) | |
Merge branches 'sa1100-for-next' and 'unstable/sa11x0-asoc' into sa1100
Diffstat (limited to 'include/net/udplite.h')
| -rw-r--r-- | include/net/udplite.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/include/net/udplite.h b/include/net/udplite.h index 299c14ce2bb9..786919d29f8d 100644 --- a/include/net/udplite.h +++ b/include/net/udplite.h @@ -66,14 +66,18 @@ static inline int udplite_checksum_init(struct sk_buff *skb, struct udphdr *uh) /* Fast-path computation of checksum. Socket may not be locked. */ static inline __wsum udplite_csum(struct sk_buff *skb) { - const struct udp_sock *up = udp_sk(skb->sk); const int off = skb_transport_offset(skb); + const struct sock *sk = skb->sk; int len = skb->len - off; - if ((up->pcflag & UDPLITE_SEND_CC) && up->pcslen < len) { - if (0 < up->pcslen) - len = up->pcslen; - udp_hdr(skb)->len = htons(up->pcslen); + if (udp_test_bit(UDPLITE_SEND_CC, sk)) { + u16 pcslen = READ_ONCE(udp_sk(sk)->pcslen); + + if (pcslen < len) { + if (pcslen > 0) + len = pcslen; + udp_hdr(skb)->len = htons(pcslen); + } } skb->ip_summed = CHECKSUM_NONE; /* no HW support for checksumming */ @@ -81,6 +85,4 @@ static inline __wsum udplite_csum(struct sk_buff *skb) } void udplite4_register(void); -int udplite_get_port(struct sock *sk, unsigned short snum, - int (*scmp)(const struct sock *, const struct sock *)); #endif /* _UDPLITE_H */ |