git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net/virtio: improve queue init error path
[dpdk.git]
/
drivers
/
net
/
txgbe
/
txgbe_ethdev.h
diff --git
a/drivers/net/txgbe/txgbe_ethdev.h
b/drivers/net/txgbe/txgbe_ethdev.h
index
901eb2b
..
8d46e6b
100644
(file)
--- a/
drivers/net/txgbe/txgbe_ethdev.h
+++ b/
drivers/net/txgbe/txgbe_ethdev.h
@@
-9,6
+9,9
@@
#include "base/txgbe.h"
#include "txgbe_ptypes.h"
#include "base/txgbe.h"
#include "txgbe_ptypes.h"
+#ifdef RTE_LIB_SECURITY
+#include "txgbe_ipsec.h"
+#endif
#include <rte_flow.h>
#include <rte_flow_driver.h>
#include <rte_time.h>
#include <rte_flow.h>
#include <rte_flow_driver.h>
#include <rte_time.h>
@@
-25,6
+28,7
@@
#define TXGBE_FLAG_PHY_INTERRUPT (uint32_t)(1 << 2)
#define TXGBE_FLAG_MACSEC (uint32_t)(1 << 3)
#define TXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)
#define TXGBE_FLAG_PHY_INTERRUPT (uint32_t)(1 << 2)
#define TXGBE_FLAG_MACSEC (uint32_t)(1 << 3)
#define TXGBE_FLAG_NEED_LINK_CONFIG (uint32_t)(1 << 4)
+#define TXGBE_FLAG_NEED_AN_CONFIG (uint32_t)(1 << 5)
/*
* Defines that were not part of txgbe_type.h as they are not used by the
/*
* Defines that were not part of txgbe_type.h as they are not used by the
@@
-135,9
+139,9
@@
struct txgbe_rte_flow_rss_conf {
struct txgbe_interrupt {
uint32_t flags;
uint32_t mask_misc;
struct txgbe_interrupt {
uint32_t flags;
uint32_t mask_misc;
-
/* to save original
mask during delayed handler */
- uint
32_t mask_misc_orig
;
- uint
32_t mask[2];
+
uint32_t mask_misc_orig; /* save
mask during delayed handler */
+ uint
64_t mask
;
+ uint
64_t mask_orig; /* save mask during delayed handler */
};
#define TXGBE_NB_STAT_MAPPING 32
};
#define TXGBE_NB_STAT_MAPPING 32
@@
-357,6
+361,9
@@
struct txgbe_adapter {
struct txgbe_filter_info filter;
struct txgbe_l2_tn_info l2_tn;
struct txgbe_bw_conf bw_conf;
struct txgbe_filter_info filter;
struct txgbe_l2_tn_info l2_tn;
struct txgbe_bw_conf bw_conf;
+#ifdef RTE_LIB_SECURITY
+ struct txgbe_ipsec ipsec;
+#endif
bool rx_bulk_alloc_allowed;
struct rte_timecounter systime_tc;
struct rte_timecounter rx_tstamp_tc;
bool rx_bulk_alloc_allowed;
struct rte_timecounter systime_tc;
struct rte_timecounter rx_tstamp_tc;
@@
-415,6
+422,9
@@
struct txgbe_adapter {
#define TXGBE_DEV_TM_CONF(dev) \
(&((struct txgbe_adapter *)(dev)->data->dev_private)->tm_conf)
#define TXGBE_DEV_TM_CONF(dev) \
(&((struct txgbe_adapter *)(dev)->data->dev_private)->tm_conf)
+#define TXGBE_DEV_IPSEC(dev) \
+ (&((struct txgbe_adapter *)(dev)->data->dev_private)->ipsec)
+
/*
* RX/TX function prototypes
*/
/*
* RX/TX function prototypes
*/
@@
-466,6
+476,12
@@
void txgbe_rxq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
void txgbe_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
struct rte_eth_txq_info *qinfo);
void txgbe_txq_info_get(struct rte_eth_dev *dev, uint16_t queue_id,
struct rte_eth_txq_info *qinfo);
+int txgbevf_dev_rx_init(struct rte_eth_dev *dev);
+
+void txgbevf_dev_tx_init(struct rte_eth_dev *dev);
+
+void txgbevf_dev_rxtx_start(struct rte_eth_dev *dev);
+
uint16_t txgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);
uint16_t txgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
uint16_t nb_pkts);