Code Review
/
deb_dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
New upstream version 17.11.4
[deb_dpdk.git]
/
drivers
/
net
/
enic
/
enic.h
diff --git
a/drivers/net/enic/enic.h
b/drivers/net/enic/enic.h
index
e28f223
..
8bbff18
100644
(file)
--- a/
drivers/net/enic/enic.h
+++ b/
drivers/net/enic/enic.h
@@
-53,13
+53,6
@@
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Poll-mode Driver"
#define DRV_COPYRIGHT "Copyright 2008-2015 Cisco Systems, Inc"
#define DRV_DESCRIPTION "Cisco VIC Ethernet NIC Poll-mode Driver"
#define DRV_COPYRIGHT "Copyright 2008-2015 Cisco Systems, Inc"
-#define ENIC_WQ_MAX 8
-/* With Rx scatter support, we use two RQs on VIC per RQ used by app. Both
- * RQs use the same CQ.
- */
-#define ENIC_RQ_MAX 16
-#define ENIC_CQ_MAX (ENIC_WQ_MAX + (ENIC_RQ_MAX / 2))
-#define ENIC_INTR_MAX (ENIC_CQ_MAX + 2)
#define ENIC_MAX_MAC_ADDR 64
#define VLAN_ETH_HLEN 18
#define ENIC_MAX_MAC_ADDR 64
#define VLAN_ETH_HLEN 18
@@
-146,21
+139,22
@@
struct enic {
u8 adv_filters;
u32 flow_filter_mode;
u8 filter_tags;
u8 adv_filters;
u32 flow_filter_mode;
u8 filter_tags;
+ uint8_t ig_vlan_rewrite_mode; /* devargs ig-vlan-rewrite */
unsigned int flags;
unsigned int priv_flags;
unsigned int flags;
unsigned int priv_flags;
- /* work queue */
- struct vnic_wq
wq[ENIC_WQ_MAX]
;
- unsigned int wq_count;
+ /* work queue
(len = conf_wq_count)
*/
+ struct vnic_wq
*wq
;
+ unsigned int wq_count;
/* equals eth_dev nb_tx_queues */
- /* receive queue */
- struct vnic_rq
rq[ENIC_RQ_MAX]
;
- unsigned int rq_count;
+ /* receive queue
(len = conf_rq_count)
*/
+ struct vnic_rq
*rq
;
+ unsigned int rq_count;
/* equals eth_dev nb_rx_queues */
- /* completion queue */
- struct vnic_cq
cq[ENIC_CQ_MAX]
;
- unsigned int cq_count;
+ /* completion queue
(len = conf_cq_count)
*/
+ struct vnic_cq
*cq
;
+ unsigned int cq_count;
/* equals rq_count + wq_count */
/* interrupt resource */
struct vnic_intr intr;
/* interrupt resource */
struct vnic_intr intr;
@@
-227,11
+221,6
@@
static inline unsigned int enic_cq_wq(struct enic *enic, unsigned int wq)
return enic->rq_count + wq;
}
return enic->rq_count + wq;
}
-static inline unsigned int enic_msix_err_intr(__rte_unused struct enic *enic)
-{
- return 0;
-}
-
static inline struct enic *pmd_priv(struct rte_eth_dev *eth_dev)
{
return (struct enic *)eth_dev->data->dev_private;
static inline struct enic *pmd_priv(struct rte_eth_dev *eth_dev)
{
return (struct enic *)eth_dev->data->dev_private;
@@
-287,7
+276,7
@@
extern int enic_enable(struct enic *enic);
extern int enic_disable(struct enic *enic);
extern void enic_remove(struct enic *enic);
extern int enic_get_link_status(struct enic *enic);
extern int enic_disable(struct enic *enic);
extern void enic_remove(struct enic *enic);
extern int enic_get_link_status(struct enic *enic);
-extern
void
enic_dev_stats_get(struct enic *enic,
+extern
int
enic_dev_stats_get(struct enic *enic,
struct rte_eth_stats *r_stats);
extern void enic_dev_stats_clear(struct enic *enic);
extern void enic_add_packet_filter(struct enic *enic);
struct rte_eth_stats *r_stats);
extern void enic_dev_stats_clear(struct enic *enic);
extern void enic_add_packet_filter(struct enic *enic);