X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=drivers%2Fnet%2Fsfc%2Fsfc.h;h=cf95ebaf90e1bd70945713e25efeb5797c3e7b3e;hb=397b4b3c509574a55c58ae161f5a01cc8a4da56a;hp=725dd5ee6208db23eeece97f93f0c1eed10fd5c5;hpb=2646d42fff6df8dcecec1b9c85a9c3129a4b764d;p=dpdk.git

diff --git a/drivers/net/sfc/sfc.h b/drivers/net/sfc/sfc.h
index 725dd5ee62..cf95ebaf90 100644
--- a/drivers/net/sfc/sfc.h
+++ b/drivers/net/sfc/sfc.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: BSD-3-Clause
  *
- * Copyright (c) 2016-2018 Solarflare Communications Inc.
- * All rights reserved.
+ * Copyright(c) 2019-2020 Xilinx, Inc.
+ * Copyright(c) 2016-2019 Solarflare Communications Inc.
  *
  * This software was jointly developed between OKTET Labs (under contract
  * for Solarflare) and Solarflare Communications, Inc.
@@ -108,6 +108,7 @@ struct sfc_intr {
 	efx_intr_type_t			type;
 	rte_intr_callback_fn		handler;
 	boolean_t			lsc_intr;
+	boolean_t			rxq_intr;
 };
 
 struct sfc_rxq;
@@ -134,7 +135,7 @@ struct sfc_port {
 	boolean_t			promisc;
 	boolean_t			allmulti;
 
-	struct ether_addr		default_mac_addr;
+	struct rte_ether_addr		default_mac_addr;
 
 	unsigned int			max_mcast_addrs;
 	unsigned int			nb_mcast_addrs;
@@ -241,10 +242,19 @@ struct sfc_adapter {
 	struct sfc_port			port;
 	struct sfc_filter		filter;
 
+	struct sfc_flow_list		flow_list;
+
 	unsigned int			rxq_max;
 	unsigned int			txq_max;
 
+	unsigned int			rxq_max_entries;
+	unsigned int			rxq_min_entries;
+
 	unsigned int			txq_max_entries;
+	unsigned int			txq_min_entries;
+
+	unsigned int			evq_max_entries;
+	unsigned int			evq_min_entries;
 
 	uint32_t			evq_flags;
 	unsigned int			evq_count;
@@ -279,6 +289,7 @@ struct sfc_adapter {
 	struct sfc_txq			*txq_ctrl;
 
 	boolean_t			tso;
+	boolean_t			tso_encap;
 
 	uint32_t			rxd_wait_timeout_ns;
 };
@@ -396,6 +407,7 @@ void sfc_port_link_mode_to_info(efx_link_mode_t link_mode,
 int sfc_port_update_mac_stats(struct sfc_adapter *sa);
 int sfc_port_reset_mac_stats(struct sfc_adapter *sa);
 int sfc_set_rx_mode(struct sfc_adapter *sa);
+int sfc_set_rx_mode_unchecked(struct sfc_adapter *sa);
 
 
 #ifdef __cplusplus