From: Daniele Di Proietto <daniele.di.proietto@gmail.com>
Date: Thu, 23 Jan 2014 16:18:59 +0000 (+0100)
Subject: datapath: Fix ovs_dp_cmd_msg_size()
X-Git-Tag: v2.1.0~29
X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fovs.git;a=commitdiff_plain;h=ce7f31f3119565b17615bf6969709aff4bbe66de

datapath: Fix ovs_dp_cmd_msg_size()

commit c58cc9a460fd158e5250e59902e96ac677dc115f (datapath: Allow user space to
announce ability to accept unaligned Netlink messages) introduced
OVS_DP_ATTR_USER_FEATURES netlink attribute in datapath responses,
but the attribute size was not taken into account in ovs_dp_cmd_msg_size().

Signed-off-by: Daniele Di Proietto <daniele.di.proietto@gmail.com>
Signed-off-by: Jesse Gross <jesse@nicira.com>
---

diff --git a/datapath/datapath.c b/datapath/datapath.c
index c756e2f5c..f045fe4b5 100644
--- a/datapath/datapath.c
+++ b/datapath/datapath.c
@@ -1089,6 +1089,7 @@ static size_t ovs_dp_cmd_msg_size(void)
 	msgsize += nla_total_size(IFNAMSIZ);
 	msgsize += nla_total_size(sizeof(struct ovs_dp_stats));
 	msgsize += nla_total_size(sizeof(struct ovs_dp_megaflow_stats));
+	msgsize += nla_total_size(sizeof(u32)); /* OVS_DP_ATTR_USER_FEATURES */
 
 	return msgsize;
 }