diff options
| author |   Damjan Marion <damarion@cisco.com> | 2017-01-31 17:29:33 +0100 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2017-02-04 12:42:49 +0000 |
| commit | d0f673ee92121e13a88ad7002e0c860b2cfc5e4b (patch) | |
| tree | ee8f951d2672f4420594d0eca5bc11f4943bdfd0 /src | |
| parent | bfe4dfa7089b5d2c03aa607ab72abbcd840cbbce (diff) | |
dpdk: move to uio_pci_generic
Change-Id: I3d8b7947ae6d721e9b514a59a7d2de49aed419b5
Signed-off-by: Damjan Marion <damarion@cisco.com>
Diffstat (limited to 'src')
| -rwxr-xr-x | src/vnet/devices/dpdk/init.c | 2 | ||||
| -rw-r--r-- | src/vpp/conf/startup.conf | 6 | ||||
| -rw-r--r-- | src/vpp/conf/startup.uiopcigeneric.conf | 18 |
3 files changed, 4 insertions, 22 deletions
diff --git a/src/vnet/devices/dpdk/init.c b/src/vnet/devices/dpdk/init.c index 01ef48cb0f3..7249cc52e9b 100755 --- a/src/vnet/devices/dpdk/init.c +++ b/src/vnet/devices/dpdk/init.c @@ -1165,7 +1165,7 @@ dpdk_config (vlib_main_t * vm, unformat_input_t * input) } if (!conf->uio_driver_name) - conf->uio_driver_name = format (0, "igb_uio%c", 0); + conf->uio_driver_name = format (0, "uio_pci_generic%c", 0); /* * Use 1G huge pages if available. diff --git a/src/vpp/conf/startup.conf b/src/vpp/conf/startup.conf index bce002027bf..a100e3e6ea7 100644 --- a/src/vpp/conf/startup.conf +++ b/src/vpp/conf/startup.conf @@ -80,9 +80,9 @@ dpdk { # num-rx-queues 2 # } - ## Change UIO driver used by VPP, Options are: uio_pci_generic, vfio-pci - ## and igb_uio (default) - # uio-driver uio_pci_generic + ## Change UIO driver used by VPP, Options are: igb_uio, vfio-pci + ## and uio_pci_generic (default) + # uio-driver vfio-pci ## Disable mutli-segment buffers, improves performance but ## disables Jumbo MTU support diff --git a/src/vpp/conf/startup.uiopcigeneric.conf b/src/vpp/conf/startup.uiopcigeneric.conf deleted file mode 100644 index 03a89dff70f..00000000000 --- a/src/vpp/conf/startup.uiopcigeneric.conf +++ /dev/null @@ -1,18 +0,0 @@ - -unix { - nodaemon - log /tmp/vpp.log - full-coredump -} - -dpdk { - uio-driver uio_pci_generic -} - -api-trace { - on -} - -api-segment { - gid vpp -} |