diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-09-05 14:24:11 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-09-05 14:24:11 +0300 |
| commit | 62cc20bcf25617dd5ad23356ea46830da3ef7356 (patch) | |
| tree | afc8bd217bd3227d26b4aebf3526723c28fe3a08 /include/uapi/linux/openvswitch.h | |
| parent | a1eb1411b4e4251db02179e39d234c2ee5192c72 (diff) | |
| parent | 135e8c9250dd5c8c9aae5984fde6f230d0cbfeaf (diff) | |
| download | linux-62cc20bcf25617dd5ad23356ea46830da3ef7356.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/uapi/linux/openvswitch.h')
| -rw-r--r-- | include/uapi/linux/openvswitch.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/uapi/linux/openvswitch.h b/include/uapi/linux/openvswitch.h index d95a3018f6a1..54c3b4f4aceb 100644 --- a/include/uapi/linux/openvswitch.h +++ b/include/uapi/linux/openvswitch.h @@ -583,7 +583,7 @@ enum ovs_userspace_attr { #define OVS_USERSPACE_ATTR_MAX (__OVS_USERSPACE_ATTR_MAX - 1) struct ovs_action_trunc { - uint32_t max_len; /* Max packet size in bytes. */ + __u32 max_len; /* Max packet size in bytes. */ }; /** @@ -632,8 +632,8 @@ enum ovs_hash_alg { * @hash_basis: basis used for computing hash. */ struct ovs_action_hash { - uint32_t hash_alg; /* One of ovs_hash_alg. */ - uint32_t hash_basis; + __u32 hash_alg; /* One of ovs_hash_alg. */ + __u32 hash_basis; }; /** |