diff options
author | Ben Pfaff <blp@nicira.com> | 2011-05-12 12:05:42 -0700 |
---|---|---|
committer | Ben Pfaff <blp@nicira.com> | 2011-05-12 12:05:42 -0700 |
commit | 007948177581f3b3dad188221593d0e4bdca6ba0 (patch) | |
tree | f1acdac6058c28a0905f717612e3cb3c84fcea06 /lib/bond.h | |
parent | fc08b7a2397ef0cf55014c1ee159599fb420b73e (diff) | |
parent | 2db65bf72c008cf7ee658d0b44744b39495ead14 (diff) |
Merge 'master' into 'next'.
Diffstat (limited to 'lib/bond.h')
-rw-r--r-- | lib/bond.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -50,6 +50,7 @@ const char *bond_detect_mode_to_string(enum bond_detect_mode); /* Configuration for a bond as a whole. */ struct bond_settings { char *name; /* Bond's name, for log messages. */ + uint32_t basis; /* Flow hashing basis. */ /* Balancing configuration. */ enum bond_mode balance; @@ -74,7 +75,7 @@ void bond_destroy(struct bond *); bool bond_reconfigure(struct bond *, const struct bond_settings *); void bond_slave_register(struct bond *, void *slave_, - uint16_t stable_id, struct netdev *); + uint32_t stable_id, struct netdev *); void bond_slave_set_netdev(struct bond *, void *slave_, struct netdev *); void bond_slave_unregister(struct bond *, const void *slave); |