diff options
| author | Yuri Benditovich <yuri.benditovich@daynix.com> | 2020-01-27 13:54:05 +0200 |
|---|---|---|
| committer | Jason Wang <jasowang@redhat.com> | 2020-03-03 18:04:47 +0800 |
| commit | 2683a927ff21b54a7300ac70c3c89652f2194969 (patch) | |
| tree | d395a30c7f7a7a2b7870a8f98be3a21805d1f698 /hw/net | |
| parent | 33bbc05eabe5109d270faf10493a3ebebd541ecd (diff) | |
| download | qemu-2683a927ff21b54a7300ac70c3c89652f2194969.zip qemu-2683a927ff21b54a7300ac70c3c89652f2194969.tar.gz qemu-2683a927ff21b54a7300ac70c3c89652f2194969.tar.bz2 | |
NetRxPkt: fix hash calculation of IPV6 TCP
When requested to calculate the hash for TCPV6 packet,
ignore overrides of source and destination addresses
in in extension headers.
Use these overrides when new hash type NetPktRssIpV6TcpEx
requested.
Use this type in e1000e hash calculation for IPv6 TCP, which
should take in account overrides of the addresses.
Signed-off-by: Yuri Benditovich <yuri.benditovich@daynix.com>
Acked-by: Dmitry Fleytman <dmitry.fleytman@gmail.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'hw/net')
| -rw-r--r-- | hw/net/e1000e_core.c | 2 | ||||
| -rw-r--r-- | hw/net/net_rx_pkt.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/net/e1000e_core.c b/hw/net/e1000e_core.c index d110c5a..94ea34d 100644 --- a/hw/net/e1000e_core.c +++ b/hw/net/e1000e_core.c @@ -582,7 +582,7 @@ e1000e_rss_calc_hash(E1000ECore *core, type = NetPktRssIpV4Tcp; break; case E1000_MRQ_RSS_TYPE_IPV6TCP: - type = NetPktRssIpV6Tcp; + type = NetPktRssIpV6TcpEx; break; case E1000_MRQ_RSS_TYPE_IPV6: type = NetPktRssIpV6; diff --git a/hw/net/net_rx_pkt.c b/hw/net/net_rx_pkt.c index b2a06bd..1e1c504 100644 --- a/hw/net/net_rx_pkt.c +++ b/hw/net/net_rx_pkt.c @@ -348,7 +348,7 @@ net_rx_pkt_calc_rss_hash(struct NetRxPkt *pkt, assert(pkt->isip6); assert(pkt->istcp); trace_net_rx_pkt_rss_ip6_tcp(); - _net_rx_rss_prepare_ip6(&rss_input[0], pkt, true, &rss_length); + _net_rx_rss_prepare_ip6(&rss_input[0], pkt, false, &rss_length); _net_rx_rss_prepare_tcp(&rss_input[0], pkt, &rss_length); break; case NetPktRssIpV6: |