mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-09-01 06:45:17 +00:00
Code Issues Releases Wiki Activity

dpif: Allow the port number to be requested when adding an interface.

Browse Source 
The datapath allows requesting a specific port number for a port, but
the dpif interface didn't expose it.  This commit adds that support.

Signed-off-by: Justin Pettit <jpettit@nicira.com>
This commit is contained in:
Justin Pettit
2012-07-27 23:58:24 -07:00
parent 8a77bb2ec8
commit 232dfa4aa3
5 changed files with 38 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/dpif-linux.c
View File

@@ -424,11 +424,13 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,
netdev_linux_ethtool_set_flag(netdev, ETH_FLAG_LRO, "LRO", false);
}
/* Loop until we find a port that isn't used. */
/* Unless a specific port was requested, loop until we find a port
* that isn't used. */
do {
uint32_t upcall_pid;
request.port_no = ++dpif->alloc_port_no;
request.port_no = *port_nop != UINT16_MAX ? *port_nop
: ++dpif->alloc_port_no;
upcall_pid = dpif_linux_port_get_pid(dpif_, request.port_no);
request.upcall_pid = &upcall_pid;
error = dpif_linux_vport_transact(&request, &reply, &buf);
@@ -441,10 +443,13 @@ dpif_linux_port_add(struct dpif *dpif_, struct netdev *netdev,
/* Older datapath has lower limit. */
max_ports = dpif->alloc_port_no;
dpif->alloc_port_no = 0;
} else if (error == EBUSY && *port_nop != UINT16_MAX) {
VLOG_INFO("%s: requested port %"PRIu16" is in use",
dpif_name(dpif_), *port_nop);
}
ofpbuf_delete(buf);
} while ((i++ < max_ports)
} while ((*port_nop == UINT16_MAX) && (i++ < max_ports)
&& (error == EBUSY || error == EFBIG));
return error;