From 1586ff4cefa050911ce73e1ae1291272654898a8 Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Sat, 9 Jul 2016 02:06:10 +0100 Subject: [PATCH] drivers: revert vdev driver names to original In order to avoid API breakage, the driver names of the virtual devices have been renamed to their original name, before the modification of the PMD_REGISTER_DRIVER macro, which sets now the driver names. Fixes: cb6696d22023 ("drivers: update registration macro usage") Signed-off-by: Pablo de Lara Acked-by: Neil Horman --- drivers/net/bonding/rte_eth_bond_pmd.c | 4 ++-- drivers/net/mpipe/mpipe_tilegx.c | 4 ++-- drivers/net/pcap/rte_eth_pcap.c | 4 ++-- drivers/net/xenvirt/rte_eth_xenvirt.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c index e2890bebb0..c3737467f7 100644 --- a/drivers/net/bonding/rte_eth_bond_pmd.c +++ b/drivers/net/bonding/rte_eth_bond_pmd.c @@ -2515,9 +2515,9 @@ static struct rte_driver bond_drv = { .uninit = bond_uninit, }; -PMD_REGISTER_DRIVER(bond_drv, bonding); +PMD_REGISTER_DRIVER(bond_drv, eth_bond); -DRIVER_REGISTER_PARAM_STRING(bonding, "slave= primary= mode=[0-4] " +DRIVER_REGISTER_PARAM_STRING(eth_bond, "slave= primary= mode=[0-4] " "xmit_policy=[l2 | l23 | l34] socket_id= mac= " "lsc_poll_period_ms= up_delay= down_delay="); diff --git a/drivers/net/mpipe/mpipe_tilegx.c b/drivers/net/mpipe/mpipe_tilegx.c index 4a2a9052a8..64f4251fdc 100644 --- a/drivers/net/mpipe/mpipe_tilegx.c +++ b/drivers/net/mpipe/mpipe_tilegx.c @@ -1635,8 +1635,8 @@ static struct rte_driver pmd_mpipe_gbe_drv = { .init = rte_pmd_mpipe_devinit, }; -PMD_REGISTER_DRIVER(pmd_mpipe_xgbe_drv, mpipe_xgbe); -PMD_REGISTER_DRIVER(pmd_mpipe_gbe_drv, mpipe_gbe); +PMD_REGISTER_DRIVER(pmd_mpipe_xgbe_drv, xgbe); +PMD_REGISTER_DRIVER(pmd_mpipe_gbe_drv, gbe); static void __attribute__((constructor, used)) mpipe_init_contexts(void) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index b341f93a38..7125823517 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1090,6 +1090,6 @@ static struct rte_driver pmd_pcap_drv = { .uninit = rte_pmd_pcap_devuninit, }; -PMD_REGISTER_DRIVER(pmd_pcap_drv, pcap); -DRIVER_REGISTER_PARAM_STRING(pcap, "rx_pcap= tx_pcap= " +PMD_REGISTER_DRIVER(pmd_pcap_drv, eth_pcap); +DRIVER_REGISTER_PARAM_STRING(eth_pcap, "rx_pcap= tx_pcap= " "rx_iface= tx_iface= iface="); diff --git a/drivers/net/xenvirt/rte_eth_xenvirt.c b/drivers/net/xenvirt/rte_eth_xenvirt.c index 47e329990a..51225590d0 100644 --- a/drivers/net/xenvirt/rte_eth_xenvirt.c +++ b/drivers/net/xenvirt/rte_eth_xenvirt.c @@ -766,4 +766,4 @@ static struct rte_driver pmd_xenvirt_drv = { .uninit = rte_pmd_xenvirt_devuninit, }; -PMD_REGISTER_DRIVER(pmd_xenvirt_drv, xenvirt); +PMD_REGISTER_DRIVER(pmd_xenvirt_drv, eth_xenvirt); -- 2.20.1