diff options
| author |   David S. Miller <davem@davemloft.net> | 2021-06-04 14:27:07 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-06-04 14:27:07 -0700 |
| commit | 26821ecd3b489c11ecfbd3942bc7fef7629464b6 (patch) | |
| tree | e2cd356b03b5c1c0f18b855184252cec2d4f295d /include | |
| parent | Merge branch 'wireguard-fixes' (diff) | |
| parent | virtchnl: Add missing padding to virtchnl_proto_hdrs (diff) | |
| download | wireguard-linux-26821ecd3b489c11ecfbd3942bc7fef7629464b6.tar.xz wireguard-linux-26821ecd3b489c11ecfbd3942bc7fef7629464b6.zip | |
Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue
Tony Nguyen says:
====================
Intel Wired LAN Driver Updates 2021-06-04
This series contains updates to virtchnl header file and ice driver.
Brett fixes VF being unable to request a different number of queues then
allocated and adds clearing of VF_MBX_ATQLEN register for VF reset.
Haiyue handles error of rebuilding VF VSI during reset.
Paul fixes reporting of autoneg to use the PHY capabilities.
Dave allows LLDP packets without priority of TC_PRIO_CONTROL to be
transmitted.
Geert Uytterhoeven adds explicit padding to virtchnl_proto_hdrs
structure in the virtchnl header file.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -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 |