New upstream version 18.11.2

[deb_dpdk.git] / drivers / net / enic / enic.h

diff --git a/drivers/net/enic/enic.h b/drivers/net/enic/enic.h
index 7bca3ca..377f607 100644 (file)
--- a/drivers/net/enic/enic.h
+++ b/drivers/net/enic/enic.h
@@ -78,8 +78,8 @@ struct enic_fdir {
        u32 modes;
        u32 types_mask;
        void (*copy_fltr_fn)(struct filter_v2 *filt,
-                            struct rte_eth_fdir_input *input,
-                            struct rte_eth_fdir_masks *masks);
+                            const struct rte_eth_fdir_input *input,
+                            const struct rte_eth_fdir_masks *masks);
 };
 
 struct enic_soft_stats {
@@ -201,8 +201,8 @@ struct enic {
 /* Compute ethdev's max packet size from MTU */
 static inline uint32_t enic_mtu_to_max_rx_pktlen(uint32_t mtu)
 {
-       /* ethdev max size includes eth and crc whereas NIC MTU does not */
-       return mtu + ETHER_HDR_LEN + ETHER_CRC_LEN;
+       /* ethdev max size includes eth whereas NIC MTU does not */
+       return mtu + ETHER_HDR_LEN;
 }
 
 /* Get the CQ index from a Start of Packet(SOP) RQ index */
@@ -340,9 +340,5 @@ int enic_link_update(struct enic *enic);
 bool enic_use_vector_rx_handler(struct enic *enic);
 void enic_fdir_info(struct enic *enic);
 void enic_fdir_info_get(struct enic *enic, struct rte_eth_fdir_info *stats);
-void copy_fltr_v1(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
-                 struct rte_eth_fdir_masks *masks);
-void copy_fltr_v2(struct filter_v2 *fltr, struct rte_eth_fdir_input *input,
-                 struct rte_eth_fdir_masks *masks);
 extern const struct rte_flow_ops enic_flow_ops;
 #endif /* _ENIC_H_ */