diff options
| author |   Tejun Heo <tj@kernel.org> | 2016-09-06 12:35:56 -0400 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2016-09-06 12:35:56 -0400 |
| commit | 2536524a91fe5c5a9fddd282fd4e79ee0976aefe (patch) | |
| tree | 30eb5b4cd6d9ed4fda69526537d4fac454cbc5e6 /include/uapi/linux/openvswitch.h | |
| parent | libata: SCT Write Same handle ATA_DFLAG_PIO (diff) | |
| parent | Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
Merge branch 'master' into for-4.9
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; }; /** |