mpipe: fix link initialization ordering

[dpdk.git] / drivers / net / bonding / rte_eth_bond_pmd.c

diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
index 8f84ec1..b63c886 100644 (file)
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -39,6 +39,7 @@
 #include <rte_tcp.h>
 #include <rte_udp.h>
 #include <rte_ip.h>
+#include <rte_ip_frag.h>
 #include <rte_devargs.h>
 #include <rte_kvargs.h>
 #include <rte_dev.h>
@@ -479,7 +480,7 @@ ether_hash(struct ether_hdr *eth_hdr)
 static inline uint32_t
 ipv4_hash(struct ipv4_hdr *ipv4_hdr)
 {
-       return (ipv4_hdr->src_addr ^ ipv4_hdr->dst_addr);
+       return ipv4_hdr->src_addr ^ ipv4_hdr->dst_addr;
 }
 
 static inline uint32_t
@@ -552,17 +553,20 @@ xmit_l34_hash(const struct rte_mbuf *buf, uint8_t slave_count)
 
                l3hash = ipv4_hash(ipv4_hdr);
 
-               ip_hdr_offset = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *
-                               IPV4_IHL_MULTIPLIER;
-
-               if (ipv4_hdr->next_proto_id == IPPROTO_TCP) {
-                       tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
-                                       ip_hdr_offset);
-                       l4hash = HASH_L4_PORTS(tcp_hdr);
-               } else if (ipv4_hdr->next_proto_id == IPPROTO_UDP) {
-                       udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
-                                       ip_hdr_offset);
-                       l4hash = HASH_L4_PORTS(udp_hdr);
+               /* there is no L4 header in fragmented packet */
+               if (likely(rte_ipv4_frag_pkt_is_fragmented(ipv4_hdr) == 0)) {
+                       ip_hdr_offset = (ipv4_hdr->version_ihl & IPV4_HDR_IHL_MASK) *
+                                       IPV4_IHL_MULTIPLIER;
+
+                       if (ipv4_hdr->next_proto_id == IPPROTO_TCP) {
+                               tcp_hdr = (struct tcp_hdr *)((char *)ipv4_hdr +
+                                               ip_hdr_offset);
+                               l4hash = HASH_L4_PORTS(tcp_hdr);
+                       } else if (ipv4_hdr->next_proto_id == IPPROTO_UDP) {
+                               udp_hdr = (struct udp_hdr *)((char *)ipv4_hdr +
+                                               ip_hdr_offset);
+                               l4hash = HASH_L4_PORTS(udp_hdr);
+                       }
                }
        } else if  (rte_cpu_to_be_16(ETHER_TYPE_IPv6) == proto) {
                struct ipv6_hdr *ipv6_hdr = (struct ipv6_hdr *)