[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 7/7] net/eth: Add an assert() and invert if() statement to sim
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v5 7/7] net/eth: Add an assert() and invert if() statement to simplify code |
Date: |
Wed, 10 Mar 2021 17:01:35 +0100 |
To simplify the function body, invert the if() statement, returning
earlier.
Since we already checked there is enough data in the iovec buffer,
simply add an assert() call to consume the bytes_read variable.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
net/eth.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index b150d73c13a..c0a5ca12be2 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -416,16 +416,14 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int
pkt_frags,
bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset,
&rt_hdr, sizeof(rt_hdr));
assert(bytes_read == sizeof(rt_hdr));
-
- if ((rt_hdr.rtype == 2) && (rt_hdr.segleft == 1)) {
- bytes_read = iov_to_buf(pkt, pkt_frags,
- ext_hdr_offset + sizeof(*ext_hdr),
- dst_addr, sizeof(*dst_addr));
-
- return bytes_read == sizeof(*dst_addr);
+ if ((rt_hdr.rtype != 2) || (rt_hdr.segleft != 1)) {
+ return false;
}
+ bytes_read = iov_to_buf(pkt, pkt_frags, ext_hdr_offset + sizeof(rt_hdr),
+ dst_addr, sizeof(*dst_addr));
+ assert(bytes_read == sizeof(*dst_addr));
- return false;
+ return true;
}
static bool
--
2.26.2
- [PATCH v5 4/7] net/eth: Check the size earlier, (continued)
[PATCH v5 7/7] net/eth: Add an assert() and invert if() statement to simplify code,
Philippe Mathieu-Daudé <=
[PATCH v5 6/7] net/eth: Read ip6_ext_hdr_routing buffer before accessing it, Philippe Mathieu-Daudé, 2021/03/10