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
9eb1b8f
..
7190935
100644
(file)
--- a/
lib/bond.h
+++ b/
lib/bond.h
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 2008, 2009, 2010, 2011 Nicira
Networks
.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira
, Inc
.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-32,7
+32,6
@@
enum lacp_status;
enum bond_mode {
BM_TCP, /* Transport Layer Load Balance. */
BM_SLB, /* Source Load Balance. */
enum bond_mode {
BM_TCP, /* Transport Layer Load Balance. */
BM_SLB, /* Source Load Balance. */
- BM_STABLE, /* Stable. */
BM_AB /* Active Backup. */
};
BM_AB /* Active Backup. */
};
@@
-46,7
+45,8
@@
struct bond_settings {
/* Balancing configuration. */
enum bond_mode balance;
/* Balancing configuration. */
enum bond_mode balance;
- int rebalance_interval; /* Milliseconds between rebalances. */
+ int rebalance_interval; /* Milliseconds between rebalances.
+ Zero to disable rebalancing. */
/* Link status detection. */
int up_delay; /* ms before enabling an up slave. */
/* Link status detection. */
int up_delay; /* ms before enabling an up slave. */
@@
-61,11
+61,11
@@
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 *);
bool bond_reconfigure(struct bond *, const struct bond_settings *);
-void bond_slave_register(struct bond *, void *slave_,
- uint32_t stable_id, struct netdev *);
+void bond_slave_register(struct bond *, void *slave_, struct netdev *);
void bond_slave_set_netdev(struct bond *, void *slave_, struct netdev *);
void bond_slave_unregister(struct bond *, const void *slave);
void bond_slave_set_netdev(struct bond *, void *slave_, struct netdev *);
void bond_slave_unregister(struct bond *, const void *slave);
@@
-89,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,