net/tcp: Add a helper tcp_ao_hdr_maclen()

0x7f454c46 · davem330 · commit 72863087f635 · 2024-06-12T06:39:04.000+01:00
It's going to be used more in TCP-AO tracepoints.

Reviewed-by: Eric Dumazet &lt;edumazet@google.com&gt;
Signed-off-by: Dmitry Safonov &lt;0x7f454c46@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/net/tcp_ao.h b/include/net/tcp_ao.h
@@ -19,6 +19,11 @@ struct tcp_ao_hdr {
 	u8	rnext_keyid;
 };
 
+static inline u8 tcp_ao_hdr_maclen(const struct tcp_ao_hdr *aoh)
+{
+	return aoh->length - sizeof(struct tcp_ao_hdr);
+}
+
 struct tcp_ao_counters {
 	atomic64_t	pkt_good;
 	atomic64_t	pkt_bad;
diff --git a/net/ipv4/tcp_ao.c b/net/ipv4/tcp_ao.c
@@ -884,8 +884,8 @@ tcp_ao_verify_hash(const struct sock *sk, const struct sk_buff *skb,
 		   const struct tcp_ao_hdr *aoh, struct tcp_ao_key *key,
 		   u8 *traffic_key, u8 *phash, u32 sne, int l3index)
 {
-	u8 maclen = aoh->length - sizeof(struct tcp_ao_hdr);
 	const struct tcphdr *th = tcp_hdr(skb);
+	u8 maclen = tcp_ao_hdr_maclen(aoh);
 	void *hash_buf = NULL;
 
 	if (maclen != tcp_ao_maclen(key)) {

Original file line number	Diff line number	Diff line change
`@@ -884,8 +884,8 @@ tcp_ao_verify_hash(const struct sock sk, const struct sk_buff skb,`
`884`	`884`	`const struct tcp_ao_hdr aoh, struct tcp_ao_key key,`
`885`	`885`	`u8 traffic_key, u8 phash, u32 sne, int l3index)`
`886`	`886`	`{`
`887`		`- u8 maclen = aoh->length - sizeof(struct tcp_ao_hdr);`
`888`	`887`	`const struct tcphdr *th = tcp_hdr(skb);`
	`888`	`+ u8 maclen = tcp_ao_hdr_maclen(aoh);`
`889`	`889`	`void *hash_buf = NULL;`
`890`	`890`
`891`	`891`	`if (maclen != tcp_ao_maclen(key)) {`