aboutsummaryrefslogtreecommitdiffstats
path: root/net/openvswitch
diff options
context:
space:
mode:
authorDaniele Di Proietto <daniele.di.proietto@gmail.com>2014-01-23 10:47:35 -0800
committerJesse Gross <jesse@nicira.com>2014-02-04 22:21:23 -0800
commit45fb9c35b27c9982e9a55d04ed0a5230a2d0b306 (patch)
treed3bca8b4e39d7ebd4951efa95bb7823f47cdacf7 /net/openvswitch
parentopenvswitch: Fix kernel panic on ovs_flow_free (diff)
downloadlinux-dev-45fb9c35b27c9982e9a55d04ed0a5230a2d0b306.tar.xz
linux-dev-45fb9c35b27c9982e9a55d04ed0a5230a2d0b306.zip
openvswitch: Fix ovs_dp_cmd_msg_size()
commit 43d4be9cb55f3bac5253e9289996fd9d735531db (openvswitch: 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>
Diffstat (limited to 'net/openvswitch')
-rw-r--r--net/openvswitch/datapath.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c
index e1b337e0bf4d..58689dda8377 100644
--- a/net/openvswitch/datapath.c
+++ b/net/openvswitch/datapath.c
@@ -1087,6 +1087,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;
}