diff options
| author | Nicolas Dichtel <nicolas.dichtel@6wind.com> | 2016-04-25 04:25:17 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-25 15:09:10 -0400 |
| commit | 0238b7204b7ff1bad1d2d4489f010d670cbd89f2 (patch) | |
| tree | 6686e37678e7e1cce5e9073b926fb2a82443017a | |
| parent | f13a82d87b21a3b7c2c3e3c75fe9cf810c332a09 (diff) | |
ovs: use nla_put_u64_64bit()
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 1 | ||||
| -rw-r--r-- | net/openvswitch/datapath.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index 0358f94af86e..d6be1fb778a5 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h | |||
| @@ -519,6 +519,7 @@ enum ovs_flow_attr { | |||
| 519 | * logging should be suppressed. */ | 519 | * logging should be suppressed. */ |
| 520 | OVS_FLOW_ATTR_UFID, /* Variable length unique flow identifier. */ | 520 | OVS_FLOW_ATTR_UFID, /* Variable length unique flow identifier. */ |
| 521 | OVS_FLOW_ATTR_UFID_FLAGS,/* u32 of OVS_UFID_F_*. */ | 521 | OVS_FLOW_ATTR_UFID_FLAGS,/* u32 of OVS_UFID_F_*. */ |
| 522 | OVS_FLOW_ATTR_PAD, | ||
| 522 | __OVS_FLOW_ATTR_MAX | 523 | __OVS_FLOW_ATTR_MAX |
| 523 | }; | 524 | }; |
| 524 | 525 | ||
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 0cc66a4e492d..22d9a5316304 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c | |||
| @@ -754,7 +754,8 @@ static int ovs_flow_cmd_fill_stats(const struct sw_flow *flow, | |||
| 754 | ovs_flow_stats_get(flow, &stats, &used, &tcp_flags); | 754 | ovs_flow_stats_get(flow, &stats, &used, &tcp_flags); |
| 755 | 755 | ||
| 756 | if (used && | 756 | if (used && |
| 757 | nla_put_u64(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used))) | 757 | nla_put_u64_64bit(skb, OVS_FLOW_ATTR_USED, ovs_flow_used_time(used), |
| 758 | OVS_FLOW_ATTR_PAD)) | ||
| 758 | return -EMSGSIZE; | 759 | return -EMSGSIZE; |
| 759 | 760 | ||
| 760 | if (stats.n_packets && | 761 | if (stats.n_packets && |
