git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mainstream'
[sliver-openvswitch.git]
/
lib
/
bond.h
diff --git
a/lib/bond.h
b/lib/bond.h
index
6190081
..
7190935
100644
(file)
--- a/
lib/bond.h
+++ b/
lib/bond.h
@@
-61,7
+61,8
@@
void bond_init(void);
/* Basics. */
struct bond *bond_create(const struct bond_settings *);
/* Basics. */
struct bond *bond_create(const struct bond_settings *);
-void bond_destroy(struct bond *);
+void bond_unref(struct bond *);
+struct bond *bond_ref(const struct bond *);
bool bond_reconfigure(struct bond *, const struct bond_settings *);
void bond_slave_register(struct bond *, void *slave_, struct netdev *);
bool bond_reconfigure(struct bond *, const struct bond_settings *);
void bond_slave_register(struct bond *, void *slave_, struct netdev *);
@@
-88,8
+89,9
@@
enum bond_verdict {
enum bond_verdict bond_check_admissibility(struct bond *, const void *slave_,
const uint8_t eth_dst[ETH_ADDR_LEN],
tag_type *);
enum bond_verdict bond_check_admissibility(struct bond *, const void *slave_,
const uint8_t eth_dst[ETH_ADDR_LEN],
tag_type *);
-void *bond_choose_output_slave(struct bond *,
- const struct flow *, uint16_t vlan, tag_type *);
+void *bond_choose_output_slave(struct bond *, const struct flow *,
+ struct flow_wildcards *, uint16_t vlan,
+ tag_type *);
/* Rebalancing. */
void bond_account(struct bond *, const struct flow *, uint16_t vlan,
/* Rebalancing. */
void bond_account(struct bond *, const struct flow *, uint16_t vlan,