diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-26 04:06:15 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-26 12:00:48 -0400 |
| commit | 66c7a5ee1a6b7c69d41dfd68d207fdd54efba56a (patch) | |
| tree | 0a343edc63d58939863c764ba553bcc34e93f9c5 /include/uapi/linux/openvswitch.h | |
| parent | 6ed46d1247a595c58b6c04481fa77cf532f45de0 (diff) | |
ovs: align nlattr properly when needed
I also fix commit 8b32ab9e6ef1: use nla_total_size_64bit() for
OVS_FLOW_ATTR_USED in ovs_flow_cmd_msg_size().
Fixes: 8b32ab9e6ef1 ("ovs: use nla_put_u64_64bit()")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/uapi/linux/openvswitch.h')
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index d6be1fb778a5..bb0d515b7654 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h | |||
| @@ -84,6 +84,7 @@ enum ovs_datapath_attr { | |||
| 84 | OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */ | 84 | OVS_DP_ATTR_STATS, /* struct ovs_dp_stats */ |
| 85 | OVS_DP_ATTR_MEGAFLOW_STATS, /* struct ovs_dp_megaflow_stats */ | 85 | OVS_DP_ATTR_MEGAFLOW_STATS, /* struct ovs_dp_megaflow_stats */ |
| 86 | OVS_DP_ATTR_USER_FEATURES, /* OVS_DP_F_* */ | 86 | OVS_DP_ATTR_USER_FEATURES, /* OVS_DP_F_* */ |
| 87 | OVS_DP_ATTR_PAD, | ||
| 87 | __OVS_DP_ATTR_MAX | 88 | __OVS_DP_ATTR_MAX |
| 88 | }; | 89 | }; |
| 89 | 90 | ||
| @@ -253,6 +254,7 @@ enum ovs_vport_attr { | |||
| 253 | OVS_VPORT_ATTR_UPCALL_PID, /* array of u32 Netlink socket PIDs for */ | 254 | OVS_VPORT_ATTR_UPCALL_PID, /* array of u32 Netlink socket PIDs for */ |
| 254 | /* receiving upcalls */ | 255 | /* receiving upcalls */ |
| 255 | OVS_VPORT_ATTR_STATS, /* struct ovs_vport_stats */ | 256 | OVS_VPORT_ATTR_STATS, /* struct ovs_vport_stats */ |
| 257 | OVS_VPORT_ATTR_PAD, | ||
| 256 | __OVS_VPORT_ATTR_MAX | 258 | __OVS_VPORT_ATTR_MAX |
| 257 | }; | 259 | }; |
| 258 | 260 | ||
