fix off-by-one errors in snprintf

[dpdk.git] / drivers / net / qede / qede_filter.c

diff --git a/drivers/net/qede/qede_filter.c b/drivers/net/qede/qede_filter.c
index c2f39ce..fd49858 100644 (file)
--- a/drivers/net/qede/qede_filter.c
+++ b/drivers/net/qede/qede_filter.c
@@ -290,7 +290,7 @@ qede_config_arfs_filter(struct rte_eth_dev *eth_dev,
        /* soft_id could have been used as memzone string, but soft_id is
         * not currently used so it has no significance.
         */
-       snprintf(mz_name, sizeof(mz_name) - 1, "%lx",
+       snprintf(mz_name, sizeof(mz_name), "%lx",
                 (unsigned long)rte_get_timer_cycles());
        mz = rte_memzone_reserve_aligned(mz_name, QEDE_MAX_FDIR_PKT_LEN,
                                         SOCKET_ID_ANY, 0, RTE_CACHE_LINE_SIZE);
@@ -457,10 +457,10 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,
        struct ecore_dev *edev = QEDE_INIT_EDEV(qdev);
        uint16_t *ether_type;
        uint8_t *raw_pkt;
-       struct ipv4_hdr *ip;
-       struct ipv6_hdr *ip6;
-       struct udp_hdr *udp;
-       struct tcp_hdr *tcp;
+       struct rte_ipv4_hdr *ip;
+       struct rte_ipv6_hdr *ip6;
+       struct rte_udp_hdr *udp;
+       struct rte_tcp_hdr *tcp;
        uint16_t len;
 
        raw_pkt = (uint8_t *)buff;
@@ -474,40 +474,40 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,
        *ether_type = rte_cpu_to_be_16(arfs->tuple.eth_proto);
        switch (arfs->tuple.eth_proto) {
        case RTE_ETHER_TYPE_IPv4:
-               ip = (struct ipv4_hdr *)raw_pkt;
+               ip = (struct rte_ipv4_hdr *)raw_pkt;
                ip->version_ihl = QEDE_FDIR_IP_DEFAULT_VERSION_IHL;
-               ip->total_length = sizeof(struct ipv4_hdr);
+               ip->total_length = sizeof(struct rte_ipv4_hdr);
                ip->next_proto_id = arfs->tuple.ip_proto;
                ip->time_to_live = QEDE_FDIR_IPV4_DEF_TTL;
                ip->dst_addr = arfs->tuple.dst_ipv4;
                ip->src_addr = arfs->tuple.src_ipv4;
-               len += sizeof(struct ipv4_hdr);
+               len += sizeof(struct rte_ipv4_hdr);
                params->ipv4 = true;
 
                raw_pkt = (uint8_t *)buff;
                /* UDP */
                if (arfs->tuple.ip_proto == IPPROTO_UDP) {
-                       udp = (struct udp_hdr *)(raw_pkt + len);
+                       udp = (struct rte_udp_hdr *)(raw_pkt + len);
                        udp->dst_port = arfs->tuple.dst_port;
                        udp->src_port = arfs->tuple.src_port;
-                       udp->dgram_len = sizeof(struct udp_hdr);
-                       len += sizeof(struct udp_hdr);
+                       udp->dgram_len = sizeof(struct rte_udp_hdr);
+                       len += sizeof(struct rte_udp_hdr);
                        /* adjust ip total_length */
-                       ip->total_length += sizeof(struct udp_hdr);
+                       ip->total_length += sizeof(struct rte_udp_hdr);
                        params->udp = true;
                } else { /* TCP */
-                       tcp = (struct tcp_hdr *)(raw_pkt + len);
+                       tcp = (struct rte_tcp_hdr *)(raw_pkt + len);
                        tcp->src_port = arfs->tuple.src_port;
                        tcp->dst_port = arfs->tuple.dst_port;
                        tcp->data_off = QEDE_FDIR_TCP_DEFAULT_DATAOFF;
-                       len += sizeof(struct tcp_hdr);
+                       len += sizeof(struct rte_tcp_hdr);
                        /* adjust ip total_length */
-                       ip->total_length += sizeof(struct tcp_hdr);
+                       ip->total_length += sizeof(struct rte_tcp_hdr);
                        params->tcp = true;
                }
                break;
        case RTE_ETHER_TYPE_IPv6:
-               ip6 = (struct ipv6_hdr *)raw_pkt;
+               ip6 = (struct rte_ipv6_hdr *)raw_pkt;
                ip6->proto = arfs->tuple.ip_proto;
                ip6->vtc_flow =
                        rte_cpu_to_be_32(QEDE_FDIR_IPV6_DEFAULT_VTC_FLOW);
@@ -516,23 +516,23 @@ qede_arfs_construct_pkt(struct rte_eth_dev *eth_dev,
                           IPV6_ADDR_LEN);
                rte_memcpy(&ip6->dst_addr, arfs->tuple.dst_ipv6,
                           IPV6_ADDR_LEN);
-               len += sizeof(struct ipv6_hdr);
+               len += sizeof(struct rte_ipv6_hdr);
                params->ipv6 = true;
 
                raw_pkt = (uint8_t *)buff;
                /* UDP */
                if (arfs->tuple.ip_proto == IPPROTO_UDP) {
-                       udp = (struct udp_hdr *)(raw_pkt + len);
+                       udp = (struct rte_udp_hdr *)(raw_pkt + len);
                        udp->src_port = arfs->tuple.src_port;
                        udp->dst_port = arfs->tuple.dst_port;
-                       len += sizeof(struct udp_hdr);
+                       len += sizeof(struct rte_udp_hdr);
                        params->udp = true;
                } else { /* TCP */
-                       tcp = (struct tcp_hdr *)(raw_pkt + len);
+                       tcp = (struct rte_tcp_hdr *)(raw_pkt + len);
                        tcp->src_port = arfs->tuple.src_port;
                        tcp->dst_port = arfs->tuple.dst_port;
                        tcp->data_off = QEDE_FDIR_TCP_DEFAULT_DATAOFF;
-                       len += sizeof(struct tcp_hdr);
+                       len += sizeof(struct rte_tcp_hdr);
                        params->tcp = true;
                }
                break;