mirror of
https://github.com/openvswitch/ovs
synced 2025-08-31 14:25:26 +00:00
vswitchd: Remove bond/migrate MAC argument.
Before this patch one could specify a mac address as part of the bond/migrate command. This will no longer make sense as bond hashing becomes more complicated.
This commit is contained in:
@@ -3268,7 +3268,6 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
|
||||
char *args = (char *) args_;
|
||||
char *save_ptr = NULL;
|
||||
char *bond_s, *hash_s, *slave_s;
|
||||
uint8_t mac[ETH_ADDR_LEN];
|
||||
struct port *port;
|
||||
struct iface *iface;
|
||||
struct bond_entry *entry;
|
||||
@@ -3289,10 +3288,7 @@ bond_unixctl_migrate(struct unixctl_conn *conn, const char *args_,
|
||||
return;
|
||||
}
|
||||
|
||||
if (sscanf(hash_s, ETH_ADDR_SCAN_FMT, ETH_ADDR_SCAN_ARGS(mac))
|
||||
== ETH_ADDR_SCAN_COUNT) {
|
||||
hash = bond_hash(mac);
|
||||
} else if (strspn(hash_s, "0123456789") == strlen(hash_s)) {
|
||||
if (strspn(hash_s, "0123456789") == strlen(hash_s)) {
|
||||
hash = atoi(hash_s) & BOND_MASK;
|
||||
} else {
|
||||
unixctl_command_reply(conn, 501, "bad hash");
|
||||
|
@@ -157,9 +157,9 @@ progress, whether it is the active slave, the MAC hashes assigned to
|
||||
the slave, and the MAC learning table entries that hash to each MAC.
|
||||
.IP "\fBbond/migrate\fR \fIport\fR \fIhash\fR \fIslave\fR"
|
||||
Assigns a given MAC hash to a new slave. \fIport\fR specifies the
|
||||
bond port, \fIhash\fR either the MAC hash to be migrated (as a decimal
|
||||
number between 0 and 255) or an Ethernet address to be hashed, and
|
||||
\fIslave\fR the new slave to be assigned.
|
||||
bond port, \fIhash\fR the MAC hash to be migrated (as a decimal
|
||||
number between 0 and 255), and \fIslave\fR the new slave to be
|
||||
assigned.
|
||||
.IP
|
||||
The reassignment is not permanent: rebalancing or fail-over will
|
||||
cause the MAC hash to be shifted to a new slave in the usual
|
||||
|
Reference in New Issue
Block a user