From: Mehak Mahajan Date: Wed, 15 Aug 2012 18:19:35 +0000 (-0700) Subject: Correct number of bytes to allocated for slaves in bundle action. X-Git-Tag: sliver-openvswitch-1.8.90-0~48^2~49 X-Git-Url: http://git.onelab.eu/?p=sliver-openvswitch.git;a=commitdiff_plain;h=21f045ac7eb2ecdd3bab919c9fc9ebb7dde84dd7 Correct number of bytes to allocated for slaves in bundle action. The size of each slave is a uint16_t. This means that each slave needs 2 bytes at the end of nx_action_bundle. Earlier, the size of each slave was not being factored in when allocating space. This commit corrects that by allocating 2 bytes for each slave when calculating the total number of bytes to be allocated at the end of nx_action_bundle. Signed-off-by: Mehak Mahajan --- diff --git a/lib/bundle.c b/lib/bundle.c index c6b1f75eb..e0f8e6b6c 100644 --- a/lib/bundle.c +++ b/lib/bundle.c @@ -217,7 +217,7 @@ bundle_check(const struct ofpact_bundle *bundle, int max_ports, void bundle_to_nxast(const struct ofpact_bundle *bundle, struct ofpbuf *openflow) { - int slaves_len = ROUND_UP(bundle->n_slaves, OFP_ACTION_ALIGN); + int slaves_len = ROUND_UP(2 * bundle->n_slaves, OFP_ACTION_ALIGN); struct nx_action_bundle *nab; ovs_be16 *slaves; size_t i;