diff options
| author |   Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:04 +0000 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2019-03-20 14:50:10 +0000 |
| commit | 36e178648f46ea9fb63d89097c59ce45fb8a67fe (patch) | |
| tree | e3ee0ea25a45aa28918dc721dd1fe19b27d6849c /drivers/net/enic/base/vnic_devcmd.h | |
| parent | 1ab31fb74132eabd45f326413eb6e4f647de48d9 (diff) | |
| parent | f7a9461e29147c47ce2bb81bd157ac1833cf5eb1 (diff) | |
Merge tag 'upstream/16.11.9' into 16.11.x
Upstream version 16.11.9
Change-Id: I947c2532ec89a9850d135bde544b4d5812b49e4f
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
Diffstat (limited to 'drivers/net/enic/base/vnic_devcmd.h')
| -rw-r--r-- | drivers/net/enic/base/vnic_devcmd.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/enic/base/vnic_devcmd.h b/drivers/net/enic/base/vnic_devcmd.h index 785fd6fd..a9496262 100644 --- a/drivers/net/enic/base/vnic_devcmd.h +++ b/drivers/net/enic/base/vnic_devcmd.h @@ -895,9 +895,9 @@ enum { }; struct filter_tlv { - u_int32_t type; - u_int32_t length; - u_int32_t val[0]; + uint32_t type; + uint32_t length; + uint32_t val[0]; }; /* Data for CMD_ADD_FILTER is 2 TLV and filter + action structs */ @@ -911,10 +911,10 @@ struct filter_tlv { * drivers should use this instead of "sizeof (struct filter_v2)" when * computing length for TLV. */ -static inline u_int32_t +static inline uint32_t vnic_filter_size(struct filter_v2 *fp) { - u_int32_t size; + uint32_t size; switch (fp->type) { case FILTER_USNIC_ID: |