diff options
| author |   John Lo <loj@cisco.com> | 2016-07-13 18:13:02 -0400 |
|---|---|---|
| committer | John Lo <loj@cisco.com> | 2016-07-13 23:07:20 -0400 |
| commit | e282121d144cda3eb429b55804c9ee2218b33ccb (patch) | |
| tree | 96dd5f969f3bb694160829d66c74c2d80bb3db95 | |
| parent | 2f653d08f4647905b241508e282a491794a54285 (diff) | |
VPP-189 Addtional fixes for last coverity fix in linux_pci.c
Fix VPP startup problem where it cannot attach to a combination
of 3 Intel igb 1GE ports and 2 Intel ixgbe 10GE ports whose PCI
addresses are specified in the DPDK section of VPP startup
config file as follows:
dpdk { dev 0000:02:00.1 dev 0000:02:00.2 dev 0000:02:00.3
dev 0000:05:00.0 dev 0000:05:00.1 }
Change-Id: Ibb12f9e9a9184d00da51a49961772ac3a42a2d1d
Signed-off-by: John Lo <loj@cisco.com>
| -rw-r--r-- | vlib/vlib/pci/linux_pci.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/vlib/vlib/pci/linux_pci.c b/vlib/vlib/pci/linux_pci.c index ba6defeb2f1..914016effca 100644 --- a/vlib/vlib/pci/linux_pci.c +++ b/vlib/vlib/pci/linux_pci.c @@ -147,14 +147,10 @@ vlib_pci_bind_to_uio (vlib_pci_device_t * d, char *uio_driver_name) drvinfo.cmd = ETHTOOL_GDRVINFO; if (ioctl (fd, SIOCETHTOOL, &ifr) < 0) { - if (errno == ENOTSUP) - /* Some interfaces (eg "lo") don't support this ioctl */ - continue; - - error = clib_error_return_unix (0, "ioctl fetch intf %s bus info", - e->d_name); - close (fd); - goto done; + /* Some interfaces (eg "lo") don't support this ioctl */ + if ((errno != ENOTSUP) && (errno != ENODEV)) + clib_unix_warning ("ioctl fetch intf %s bus info error", e->d_name); + continue; } if (strcmp ((char *) s, drvinfo.bus_info)) |