ethdev: rename interrupt callbacks field

The 'callbacks' member of the rte_eth_dev structure has been renamed
to 'link_intr_cbs' to make it clear that it refers to callbacks from
NIC interrupts. This allows us to add other types of callbacks to
the structure without ambiguity.

Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Signed-off-by: John McNamara <john.mcnamara@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>

diff --git a/app/test/virtual_pmd.c b/app/test/virtual_pmd.c
index cd9faf3..785bccc 100644 (file)
--- a/app/test/virtual_pmd.c
+++ b/app/test/virtual_pmd.c
@@ -600,7 +600,7 @@ virtual_ethdev_create(const char *name, struct ether_addr *mac_addr,
        eth_dev->data->nb_rx_queues = (uint16_t)1;
        eth_dev->data->nb_tx_queues = (uint16_t)1;
 
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        eth_dev->data->dev_link.link_status = 0;
        eth_dev->data->dev_link.link_speed = ETH_LINK_SPEED_10000;

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 27bbb0b..b69a753 100644 (file)
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -265,7 +265,7 @@ rte_eth_dev_init(struct rte_pci_driver *pci_drv,
        eth_dev->data->rx_mbuf_alloc_failed = 0;
 
        /* init user callbacks */
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        /*
         * Set the default MTU.
@@ -2743,7 +2743,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
        dev = &rte_eth_devices[port_id];
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
-       TAILQ_FOREACH(user_cb, &(dev->callbacks), next) {
+       TAILQ_FOREACH(user_cb, &(dev->link_intr_cbs), next) {
                if (user_cb->cb_fn == cb_fn &&
                        user_cb->cb_arg == cb_arg &&
                        user_cb->event == event) {
@@ -2757,7 +2757,7 @@ rte_eth_dev_callback_register(uint8_t port_id,
                user_cb->cb_fn = cb_fn;
                user_cb->cb_arg = cb_arg;
                user_cb->event = event;
-               TAILQ_INSERT_TAIL(&(dev->callbacks), user_cb, next);
+               TAILQ_INSERT_TAIL(&(dev->link_intr_cbs), user_cb, next);
        }
 
        rte_spinlock_unlock(&rte_eth_dev_cb_lock);
@@ -2784,7 +2784,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
 
        ret = 0;
-       for (cb = TAILQ_FIRST(&dev->callbacks); cb != NULL; cb = next) {
+       for (cb = TAILQ_FIRST(&dev->link_intr_cbs); cb != NULL; cb = next) {
 
                next = TAILQ_NEXT(cb, next);
 
@@ -2798,7 +2798,7 @@ rte_eth_dev_callback_unregister(uint8_t port_id,
                 * then remove it.
                 */
                if (cb->active == 0) {
-                       TAILQ_REMOVE(&(dev->callbacks), cb, next);
+                       TAILQ_REMOVE(&(dev->link_intr_cbs), cb, next);
                        rte_free(cb);
                } else {
                        ret = -EAGAIN;
@@ -2817,7 +2817,7 @@ _rte_eth_dev_callback_process(struct rte_eth_dev *dev,
        struct rte_eth_dev_callback dev_cb;
 
        rte_spinlock_lock(&rte_eth_dev_cb_lock);
-       TAILQ_FOREACH(cb_lst, &(dev->callbacks), next) {
+       TAILQ_FOREACH(cb_lst, &(dev->link_intr_cbs), next) {
                if (cb_lst->cb_fn == NULL || cb_lst->event != event)
                        continue;
                dev_cb = *cb_lst;

diff --git a/lib/librte_ether/rte_ethdev.h b/lib/librte_ether/rte_ethdev.h
index 4acd595..55d12f1 100644 (file)
--- a/lib/librte_ether/rte_ethdev.h
+++ b/lib/librte_ether/rte_ethdev.h
@@ -1398,7 +1398,7 @@ struct rte_eth_dev {
        const struct eth_driver *driver;/**< Driver for this device */
        struct eth_dev_ops *dev_ops;    /**< Functions exported by PMD */
        struct rte_pci_device *pci_dev; /**< PCI info. supplied by probing */
-       struct rte_eth_dev_cb_list callbacks; /**< User application callbacks */
+       struct rte_eth_dev_cb_list link_intr_cbs; /**< User application callbacks on interrupt */
 };
 
 struct rte_eth_dev_sriov {

diff --git a/lib/librte_pmd_bond/rte_eth_bond_api.c b/lib/librte_pmd_bond/rte_eth_bond_api.c
index b1d0bd3..230d36c 100644 (file)
--- a/lib/librte_pmd_bond/rte_eth_bond_api.c
+++ b/lib/librte_pmd_bond/rte_eth_bond_api.c
@@ -273,7 +273,7 @@ rte_eth_bond_create(const char *name, uint8_t mode, uint8_t socket_id)
        eth_dev->data->nb_rx_queues = (uint16_t)1;
        eth_dev->data->nb_tx_queues = (uint16_t)1;
 
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        eth_dev->data->dev_link.link_status = 0;
 

diff --git a/lib/librte_pmd_ring/rte_eth_ring.c b/lib/librte_pmd_ring/rte_eth_ring.c
index a23e933..a5dc71e 100644 (file)
--- a/lib/librte_pmd_ring/rte_eth_ring.c
+++ b/lib/librte_pmd_ring/rte_eth_ring.c
@@ -340,7 +340,7 @@ rte_eth_from_rings(const char *name, struct rte_ring *const rx_queues[],
        eth_dev->driver = eth_drv;
        eth_dev->dev_ops = &ops;
        eth_dev->pci_dev = pci_dev;
-       TAILQ_INIT(&(eth_dev->callbacks));
+       TAILQ_INIT(&(eth_dev->link_intr_cbs));
 
        /* finally assign rx and tx ops */
        eth_dev->rx_pkt_burst = eth_ring_rx;