diff options
| author | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
| commit | 474b313de79e034e269955de23231da769a521b7 (patch) | |
| tree | 877e3c883aff3edfe4f378c69f7ba738b0d8ef94 /include/uapi/linux/openvswitch.h | |
| parent | 2849450ad39d2e699fda2d5c6f41e05d87fd7004 (diff) | |
| parent | ee8d41e53efe14bfc5ea5866e1178b06d78a7c95 (diff) | |
Merge branch 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-4.9/msi-irq
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; }; /** |