[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 13/13] net/eth: Add an assert() and invert if() statement to simpl
From: |
Jason Wang |
Subject: |
[PULL 13/13] net/eth: Add an assert() and invert if() statement to simplify code |
Date: |
Mon, 22 Mar 2021 18:08:12 +0800 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
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.
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/eth.c | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index b2704fb..fe876d1 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -416,15 +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(rt_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.7.4
- [PULL 02/13] net: Add a 'do_not_pad" to NetClientState, (continued)
- [PULL 02/13] net: Add a 'do_not_pad" to NetClientState, Jason Wang, 2021/03/22
- [PULL 04/13] hw/net: virtio-net: Initialize nc->do_not_pad to true, Jason Wang, 2021/03/22
- [PULL 05/13] net/colo-compare.c: Fix memory leak for non-tcp packet, Jason Wang, 2021/03/22
- [PULL 06/13] net/colo-compare.c: Optimize removal of secondary packet, Jason Wang, 2021/03/22
- [PULL 07/13] net/eth: Use correct in6_address offset in _eth_get_rss_ex_dst_addr(), Jason Wang, 2021/03/22
- [PULL 08/13] net/eth: Simplify _eth_get_rss_ex_dst_addr(), Jason Wang, 2021/03/22
- [PULL 09/13] net/eth: Better describe _eth_get_rss_ex_dst_addr's offset argument, Jason Wang, 2021/03/22
- [PULL 10/13] net/eth: Check size earlier in _eth_get_rss_ex_dst_addr(), Jason Wang, 2021/03/22
- [PULL 11/13] net/eth: Check iovec has enough data earlier, Jason Wang, 2021/03/22
- [PULL 12/13] net/eth: Read ip6_ext_hdr_routing buffer before accessing it, Jason Wang, 2021/03/22
- [PULL 13/13] net/eth: Add an assert() and invert if() statement to simplify code,
Jason Wang <=
- Re: [PULL 00/13] Net patches, Peter Maydell, 2021/03/22