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/bnxt: modify resource management scheme
[dpdk.git]
/
drivers
/
net
/
avp
/
avp_ethdev.c
diff --git
a/drivers/net/avp/avp_ethdev.c
b/drivers/net/avp/avp_ethdev.c
index
504435e
..
5b47f09
100644
(file)
--- a/
drivers/net/avp/avp_ethdev.c
+++ b/
drivers/net/avp/avp_ethdev.c
@@
-32,8
+32,6
@@
#include "avp_logs.h"
#include "avp_logs.h"
-int avp_logtype_driver;
-
static int avp_dev_create(struct rte_pci_device *pci_dev,
struct rte_eth_dev *eth_dev);
static int avp_dev_create(struct rte_pci_device *pci_dev,
struct rte_eth_dev *eth_dev);
@@
-41,12
+39,12
@@
static int avp_dev_configure(struct rte_eth_dev *dev);
static int avp_dev_start(struct rte_eth_dev *dev);
static void avp_dev_stop(struct rte_eth_dev *dev);
static void avp_dev_close(struct rte_eth_dev *dev);
static int avp_dev_start(struct rte_eth_dev *dev);
static void avp_dev_stop(struct rte_eth_dev *dev);
static void avp_dev_close(struct rte_eth_dev *dev);
-static
void
avp_dev_info_get(struct rte_eth_dev *dev,
-
struct rte_eth_dev_info *dev_info);
+static
int
avp_dev_info_get(struct rte_eth_dev *dev,
+ struct rte_eth_dev_info *dev_info);
static int avp_vlan_offload_set(struct rte_eth_dev *dev, int mask);
static int avp_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
static int avp_vlan_offload_set(struct rte_eth_dev *dev, int mask);
static int avp_dev_link_update(struct rte_eth_dev *dev, int wait_to_complete);
-static
void
avp_dev_promiscuous_enable(struct rte_eth_dev *dev);
-static
void
avp_dev_promiscuous_disable(struct rte_eth_dev *dev);
+static
int
avp_dev_promiscuous_enable(struct rte_eth_dev *dev);
+static
int
avp_dev_promiscuous_disable(struct rte_eth_dev *dev);
static int avp_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
static int avp_dev_rx_queue_setup(struct rte_eth_dev *dev,
uint16_t rx_queue_id,
@@
-82,7
+80,7
@@
static void avp_dev_tx_queue_release(void *txq);
static int avp_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats);
static int avp_dev_stats_get(struct rte_eth_dev *dev,
struct rte_eth_stats *stats);
-static
void
avp_dev_stats_reset(struct rte_eth_dev *dev);
+static
int
avp_dev_stats_reset(struct rte_eth_dev *dev);
#define AVP_MAX_RX_BURST 64
#define AVP_MAX_RX_BURST 64
@@
-1694,7
+1692,7
@@
avp_xmit_scattered_pkts(void *tx_queue,
uint16_t nb_pkts)
{
struct rte_avp_desc *avp_bufs[(AVP_MAX_TX_BURST *
uint16_t nb_pkts)
{
struct rte_avp_desc *avp_bufs[(AVP_MAX_TX_BURST *
- RTE_AVP_MAX_MBUF_SEGMENTS)];
+ RTE_AVP_MAX_MBUF_SEGMENTS)]
= {}
;
struct avp_queue *txq = (struct avp_queue *)tx_queue;
struct rte_avp_desc *tx_bufs[AVP_MAX_TX_BURST];
struct avp_dev *avp = txq->avp;
struct avp_queue *txq = (struct avp_queue *)tx_queue;
struct rte_avp_desc *tx_bufs[AVP_MAX_TX_BURST];
struct avp_dev *avp = txq->avp;
@@
-2157,7
+2155,7
@@
avp_dev_link_update(struct rte_eth_dev *eth_dev,
return -1;
}
return -1;
}
-static
void
+static
int
avp_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
avp_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@
-2169,9
+2167,11
@@
avp_dev_promiscuous_enable(struct rte_eth_dev *eth_dev)
eth_dev->data->port_id);
}
rte_spinlock_unlock(&avp->lock);
eth_dev->data->port_id);
}
rte_spinlock_unlock(&avp->lock);
+
+ return 0;
}
}
-static
void
+static
int
avp_dev_promiscuous_disable(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
avp_dev_promiscuous_disable(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@
-2183,9
+2183,11
@@
avp_dev_promiscuous_disable(struct rte_eth_dev *eth_dev)
eth_dev->data->port_id);
}
rte_spinlock_unlock(&avp->lock);
eth_dev->data->port_id);
}
rte_spinlock_unlock(&avp->lock);
+
+ return 0;
}
}
-static
void
+static
int
avp_dev_info_get(struct rte_eth_dev *eth_dev,
struct rte_eth_dev_info *dev_info)
{
avp_dev_info_get(struct rte_eth_dev *eth_dev,
struct rte_eth_dev_info *dev_info)
{
@@
-2200,6
+2202,8
@@
avp_dev_info_get(struct rte_eth_dev *eth_dev,
dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;
dev_info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT;
}
dev_info->rx_offload_capa = DEV_RX_OFFLOAD_VLAN_STRIP;
dev_info->tx_offload_capa = DEV_TX_OFFLOAD_VLAN_INSERT;
}
+
+ return 0;
}
static int
}
static int
@@
-2269,7
+2273,7
@@
avp_dev_stats_get(struct rte_eth_dev *eth_dev, struct rte_eth_stats *stats)
return 0;
}
return 0;
}
-static
void
+static
int
avp_dev_stats_reset(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
avp_dev_stats_reset(struct rte_eth_dev *eth_dev)
{
struct avp_dev *avp = AVP_DEV_PRIVATE_TO_HW(eth_dev->data->dev_private);
@@
-2294,14
+2298,10
@@
avp_dev_stats_reset(struct rte_eth_dev *eth_dev)
txq->errors = 0;
}
}
txq->errors = 0;
}
}
+
+ return 0;
}
RTE_PMD_REGISTER_PCI(net_avp, rte_avp_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_avp, pci_id_avp_map);
}
RTE_PMD_REGISTER_PCI(net_avp, rte_avp_pmd);
RTE_PMD_REGISTER_PCI_TABLE(net_avp, pci_id_avp_map);
-
-RTE_INIT(avp_init_log)
-{
- avp_logtype_driver = rte_log_register("pmd.net.avp.driver");
- if (avp_logtype_driver >= 0)
- rte_log_set_level(avp_logtype_driver, RTE_LOG_NOTICE);
-}
+RTE_LOG_REGISTER(avp_logtype_driver, pmd.net.avp.driver, NOTICE);