summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/plugins/linux-cp/lcp_interface.c3
-rw-r--r--src/vnet/devices/tap/tap.c5
-rw-r--r--src/vnet/devices/tap/tap.h1
3 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/linux-cp/lcp_interface.c b/src/plugins/linux-cp/lcp_interface.c
index b1c0ad5a022..61665ad4146 100644
--- a/src/plugins/linux-cp/lcp_interface.c
+++ b/src/plugins/linux-cp/lcp_interface.c
@@ -1001,7 +1001,8 @@ lcp_itf_pair_create (u32 phy_sw_if_index, u8 *host_if_name,
clib_max (1, lcp_get_default_num_queues (0 /* is_tx */)),
.num_tx_queues =
clib_max (1, lcp_get_default_num_queues (1 /* is_tx */)),
- .id = hw->hw_if_index,
+ .id = ~0,
+ .auto_id_offset = 4096,
.sw_if_index = ~0,
.rx_ring_sz = 256,
.tx_ring_sz = 256,
diff --git a/src/vnet/devices/tap/tap.c b/src/vnet/devices/tap/tap.c
index 1e2ee87041d..b0b0a3af13f 100644
--- a/src/vnet/devices/tap/tap.c
+++ b/src/vnet/devices/tap/tap.c
@@ -85,7 +85,7 @@ virtio_eth_set_max_frame_size (vnet_main_t *vnm, vnet_hw_interface_t *hi,
return 0;
}
-#define TAP_MAX_INSTANCE 1024
+#define TAP_MAX_INSTANCE 8192
static void
tap_free (vlib_main_t * vm, virtio_if_t * vif)
@@ -162,7 +162,8 @@ tap_create_if (vlib_main_t * vm, tap_create_if_args_t * args)
}
else
{
- args->id = clib_bitmap_first_clear (tm->tap_ids);
+ args->id = clib_bitmap_next_clear (tm->tap_ids, args->auto_id_offset %
+ TAP_MAX_INSTANCE);
}
if (args->id > TAP_MAX_INSTANCE)
diff --git a/src/vnet/devices/tap/tap.h b/src/vnet/devices/tap/tap.h
index 6b88c34fe41..1df2fb7e1ad 100644
--- a/src/vnet/devices/tap/tap.h
+++ b/src/vnet/devices/tap/tap.h
@@ -42,6 +42,7 @@ typedef enum
typedef struct
{
u32 id;
+ u32 auto_id_offset;
u8 mac_addr_set;
mac_address_t mac_addr;
u16 num_rx_queues;