[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/13] net/eth: Simplify _eth_get_rss_ex_dst_addr()
From: |
Jason Wang |
Subject: |
[PULL 08/13] net/eth: Simplify _eth_get_rss_ex_dst_addr() |
Date: |
Mon, 22 Mar 2021 18:08:07 +0800 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
The length field is already contained in the ip6_ext_hdr structure.
Check it direcly in eth_parse_ipv6_hdr() before calling
_eth_get_rss_ex_dst_addr(), which gets a bit simplified.
Reviewed-by: Miroslav Rezanina <mrezanin@redhat.com>
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/eth.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index c8babfa..06badd1 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -407,9 +407,7 @@ _eth_get_rss_ex_dst_addr(const struct iovec *pkt, int
pkt_frags,
{
struct ip6_ext_hdr_routing *rthdr = (struct ip6_ext_hdr_routing *) ext_hdr;
- if ((rthdr->rtype == 2) &&
- (rthdr->len == sizeof(struct in6_address) / 8) &&
- (rthdr->segleft == 1)) {
+ if ((rthdr->rtype == 2) && (rthdr->segleft == 1)) {
size_t input_size = iov_size(pkt, pkt_frags);
size_t bytes_read;
@@ -528,10 +526,12 @@ bool eth_parse_ipv6_hdr(const struct iovec *pkt, int
pkt_frags,
}
if (curr_ext_hdr_type == IP6_ROUTING) {
- info->rss_ex_dst_valid =
- _eth_get_rss_ex_dst_addr(pkt, pkt_frags,
- ip6hdr_off + info->full_hdr_len,
- &ext_hdr, &info->rss_ex_dst);
+ if (ext_hdr.ip6r_len == sizeof(struct in6_address) / 8) {
+ info->rss_ex_dst_valid =
+ _eth_get_rss_ex_dst_addr(pkt, pkt_frags,
+ ip6hdr_off + info->full_hdr_len,
+ &ext_hdr, &info->rss_ex_dst);
+ }
} else if (curr_ext_hdr_type == IP6_DESTINATON) {
info->rss_ex_src_valid =
_eth_get_rss_ex_src_addr(pkt, pkt_frags,
--
2.7.4
- [PULL 00/13] Net patches, Jason Wang, 2021/03/22
- [PULL 01/13] net: eth: Add a helper to pad a short Ethernet frame, Jason Wang, 2021/03/22
- [PULL 03/13] net: Pad short frames to minimum size before sending from SLiRP/TAP, Jason Wang, 2021/03/22
- [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 <=
- [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, 2021/03/22
- Re: [PULL 00/13] Net patches, Peter Maydell, 2021/03/22