diff options
| author |   David S. Miller <davem@davemloft.net> | 2022-02-02 14:19:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2022-02-02 14:19:38 +0000 |
| commit | c8ff576e4e553a059e0790afd15385f418b1a854 (patch) | |
| tree | 19cbb390c6a1daa3a41c3fb36df380adf522d53c /include | |
| parent | Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue (diff) | |
| parent | net/mlx5e: Avoid field-overflowing memcpy() (diff) | |
| download | linux-dev-c8ff576e4e553a059e0790afd15385f418b1a854.tar.xz linux-dev-c8ff576e4e553a059e0790afd15385f418b1a854.zip | |
Merge tag 'mlx5-fixes-2022-02-01' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux
Saeed Mahameed says:
====================
mlx5 fixes 2022-02-01
This series provides bug fixes to mlx5 driver.
Please pull and let me know if there is any problem.
Sorry about the long series, but I had to move the top two patches from
net-next to net to help avoiding a build break when kspp branch is merged
into linus-next on next merge window.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/if_vlan.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 8420fe504927..2be4dd7e90a9 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -46,8 +46,10 @@ struct vlan_hdr { * @h_vlan_encapsulated_proto: packet type ID or len */ struct vlan_ethhdr { - unsigned char h_dest[ETH_ALEN]; - unsigned char h_source[ETH_ALEN]; + struct_group(addrs, + unsigned char h_dest[ETH_ALEN]; + unsigned char h_source[ETH_ALEN]; + ); __be16 h_vlan_proto; __be16 h_vlan_TCI; __be16 h_vlan_encapsulated_proto; |