diff options
author | Wolfram Sang <wsa@the-dreams.de> | 2018-05-15 10:41:01 +0200 |
---|---|---|
committer | Wolfram Sang <wsa@the-dreams.de> | 2018-05-15 10:41:01 +0200 |
commit | e6218bf390a9992de86a535bcb227f75e2c20cf9 (patch) | |
tree | b6bfa2374c78fedacb683b4da91afac3300807ba /drivers/net/ethernet/netronome/nfp/flower/cmsg.h | |
parent | 77bade677c3c5616dfadfd21f0220fcddbfa4cbe (diff) | |
parent | 35cd67a0caf767aba472452865dcb4471fcce2b1 (diff) | |
download | linux-e6218bf390a9992de86a535bcb227f75e2c20cf9.tar.gz linux-e6218bf390a9992de86a535bcb227f75e2c20cf9.tar.bz2 linux-e6218bf390a9992de86a535bcb227f75e2c20cf9.zip |
Merge branch 'i2c/for-current-fixed' into i2c/for-4.18
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/flower/cmsg.h')
-rw-r--r-- | drivers/net/ethernet/netronome/nfp/flower/cmsg.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h index b6c0fd053a50..bee4367a2c38 100644 --- a/drivers/net/ethernet/netronome/nfp/flower/cmsg.h +++ b/drivers/net/ethernet/netronome/nfp/flower/cmsg.h @@ -190,7 +190,10 @@ struct nfp_fl_set_ipv4_udp_tun { __be16 reserved; __be64 tun_id __packed; __be32 tun_type_index; - __be32 extra[3]; + __be16 reserved2; + u8 ttl; + u8 reserved3; + __be32 extra[2]; }; /* Metadata with L2 (1W/4B) |