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
ring: remove unnecessary forward declaration
[dpdk.git]
/
drivers
/
net
/
cxgbe
/
cxgbevf_main.c
diff --git
a/drivers/net/cxgbe/cxgbevf_main.c
b/drivers/net/cxgbe/cxgbevf_main.c
index
4214d03
..
d334550
100644
(file)
--- a/
drivers/net/cxgbe/cxgbevf_main.c
+++ b/
drivers/net/cxgbe/cxgbevf_main.c
@@
-7,10
+7,11
@@
#include <rte_ethdev_pci.h>
#include <rte_malloc.h>
#include <rte_ethdev_pci.h>
#include <rte_malloc.h>
-#include "common.h"
-#include "t4_regs.h"
-#include "t4_msg.h"
+#include "
base/
common.h"
+#include "
base/
t4_regs.h"
+#include "
base/
t4_msg.h"
#include "cxgbe.h"
#include "cxgbe.h"
+#include "mps_tcam.h"
/*
* Figure out how many Ports and Queue Sets we can support. This depends on
/*
* Figure out how many Ports and Queue Sets we can support. This depends on
@@
-49,7
+50,7
@@
static void size_nports_qsets(struct adapter *adapter)
adapter->params.nports = pmask_nports;
}
adapter->params.nports = pmask_nports;
}
- configure_max_ethqsets(adapter);
+ c
xgbe_c
onfigure_max_ethqsets(adapter);
if (adapter->sge.max_ethqsets < adapter->params.nports) {
dev_warn(adapter->pdev_dev, "only using %d of %d available"
" virtual interfaces (too few Queue Sets)\n",
if (adapter->sge.max_ethqsets < adapter->params.nports) {
dev_warn(adapter->pdev_dev, "only using %d of %d available"
" virtual interfaces (too few Queue Sets)\n",
@@
-244,7
+245,7
@@
allocate_mac:
rte_eth_copy_pci_info(pi->eth_dev, adapter->pdev);
pi->eth_dev->data->mac_addrs = rte_zmalloc(name,
rte_eth_copy_pci_info(pi->eth_dev, adapter->pdev);
pi->eth_dev->data->mac_addrs = rte_zmalloc(name,
-
ETHER_ADDR_LEN, 0);
+
RTE_
ETHER_ADDR_LEN, 0);
if (!pi->eth_dev->data->mac_addrs) {
dev_err(adapter, "%s: Mem allocation failed for storing mac addr, aborting\n",
__func__);
if (!pi->eth_dev->data->mac_addrs) {
dev_err(adapter, "%s: Mem allocation failed for storing mac addr, aborting\n",
__func__);
@@
-267,11
+268,16
@@
allocate_mac:
}
}
}
}
- cfg_queues(adapter->eth_dev);
- print_adapter_info(adapter);
- print_port_info(adapter);
+ c
xgbe_c
fg_queues(adapter->eth_dev);
+
cxgbe_
print_adapter_info(adapter);
+
cxgbe_
print_port_info(adapter);
- err = init_rss(adapter);
+ adapter->mpstcam = t4_init_mpstcam(adapter);
+ if (!adapter->mpstcam)
+ dev_warn(adapter,
+ "VF could not allocate mps tcam table. Continuing\n");
+
+ err = cxgbe_init_rss(adapter);
if (err)
goto out_free;
return 0;
if (err)
goto out_free;
return 0;
@@
-282,14
+288,7
@@
out_free:
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox, adapter->pf,
0, pi->viid);
if (pi->viid != 0)
t4_free_vi(adapter, adapter->mbox, adapter->pf,
0, pi->viid);
- /* Skip first port since it'll be de-allocated by DPDK */
- if (i == 0)
- continue;
- if (pi->eth_dev) {
- if (pi->eth_dev->data->dev_private)
- rte_free(pi->eth_dev->data->dev_private);
- rte_eth_dev_release_port(pi->eth_dev);
- }
+ rte_eth_dev_release_port(pi->eth_dev);
}
return -err;
}
}
return -err;
}