History

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().

Nicolas Dichtel committed 10 years ago

Commit 66c7a5e1 parent 6ed46d12 files · +17 −12Browse files

Showing the changes to include/uapi (1 of 2 files). Show all

Unified · Split

include/uapi/linux/openvswitch.h+2−0
@@ -84,6 +84,7 @@ enum ovs_datapath_attr { · 83 unmodified lines
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_MAX88 __OVS_DP_ATTR_MAX
88};89};
89 90
@@ -253,6 +254,7 @@ enum ovs_vport_attr { · 163 unmodified lines
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_MAX258 __OVS_VPORT_ATTR_MAX
257};259};
258 260