diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2021-06-09 03:16:11 +0300 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2021-06-09 03:16:11 +0300 |
| commit | 54ada34b4dfdb864ac602e13ff87581abe517ce9 (patch) | |
| tree | 8c92ca68c13e86b71f9cbf05a1a432c3ba4ea67b /include/linux/avf | |
| parent | 605a5e41db7d8c930fb80115686991c4c1d08ee4 (diff) | |
| parent | 4a2c1dcfaf59be4b357400d893c3f5daff6cab6c (diff) | |
| download | linux-54ada34b4dfdb864ac602e13ff87581abe517ce9.tar.xz | |
Merge branch 'rafael/acpica/cfmws' into for-5.14/cxl
Pick up the definition of the CXL Fixed Memory Window Structure from
Rafael's ACPICA development branch.
Diffstat (limited to 'include/linux/avf')
| -rw-r--r-- | include/linux/avf/virtchnl.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/avf/virtchnl.h b/include/linux/avf/virtchnl.h index 565deea6ffe8..8612f8fc86c1 100644 --- a/include/linux/avf/virtchnl.h +++ b/include/linux/avf/virtchnl.h @@ -830,6 +830,7 @@ VIRTCHNL_CHECK_STRUCT_LEN(72, virtchnl_proto_hdr); struct virtchnl_proto_hdrs { u8 tunnel_level; + u8 pad[3]; /** * specify where protocol header start from. * 0 - from the outer layer |