bond: Convert stb_id to 32bit parameter.

The 16 bits currently in use is artificially restrictive.

diff --git a/lib/bond.c b/lib/bond.c
index d7242fae2e625507b9b521415c0d0f68945d123d..2b540523ef103efd9611ed234e4d1b174ff4ef05 100644 (file)
--- a/lib/bond.c
+++ b/lib/bond.c
@@ -74,7 +74,7 @@ struct bond_slave {
     uint64_t tx_bytes;          /* Sum across 'tx_bytes' of entries. */
 
     /* BM_STABLE specific bonding info. */
-    uint16_t stb_id;            /* ID used for 'stb_slaves' ordering. */
+    uint32_t stb_id;            /* ID used for 'stb_slaves' ordering. */
 };
 
 /* A bond, that is, a set of network devices grouped to improve performance or
@@ -351,7 +351,7 @@ bond_reconfigure(struct bond *bond, const struct bond_settings *s)
  * 'slave_' or destroying 'bond'.
  */
 void
-bond_slave_register(struct bond *bond, void *slave_, uint16_t stb_id,
+bond_slave_register(struct bond *bond, void *slave_, uint32_t stb_id,
                     struct netdev *netdev)
 {
     struct bond_slave *slave = bond_slave_lookup(bond, slave_);

diff --git a/lib/bond.h b/lib/bond.h
index 5847abc102b9fc899cf9a6a74ff4d956cf5ca9dd..c2efb8b02faeff2b8d8aed39d6fb9333e2004b9c 100644 (file)
--- a/lib/bond.h
+++ b/lib/bond.h
@@ -75,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_unregister(struct bond *, const void *slave);
 
 void bond_run(struct bond *, struct tag_set *, bool lacp_negotiated);