diff options
| author |   Jakub Kicinski <kuba@kernel.org> | 2020-05-09 11:48:02 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2020-05-09 11:48:02 -0700 |
| commit | 2c674bec76d35b75c7c730f863424387c9e9633a (patch) | |
| tree | fa4de5589f90228f431513a5daab93e2798e067d /drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h | |
| parent | net: lio_core: remove redundant assignment to variable tx_done (diff) | |
| parent | net: atlantic: unify MAC generation (diff) | |
| download | linux-dev-2c674bec76d35b75c7c730f863424387c9e9633a.tar.xz linux-dev-2c674bec76d35b75c7c730f863424387c9e9633a.zip | |
Merge branch 'net-atlantic-driver-updates'
Mark Starovoytov says:
====================
net: atlantic: driver updates
This patch series contains several minor cleanups for the previously
submitted series.
We also add Marvell copyrights on newly touched files.
v2:
* accommodated review comments related to the last patch in series
(MAC generation)
v1: https://patchwork.ozlabs.org/cover/1285011/
====================
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h index 2317dd8459d0..b66fa346581c 100644 --- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h +++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2_utils.h @@ -103,7 +103,7 @@ struct sleep_proxy_s { u32 crc32; } wake_up_pattern[8]; - struct __attribute__ ((__packed__)) { + struct __packed { u8 arp_responder:1; u8 echo_responder:1; u8 igmp_client:1; @@ -119,7 +119,7 @@ struct sleep_proxy_s { u32 ipv4_offload_addr[8]; u32 reserved[8]; - struct __attribute__ ((__packed__)) { + struct __packed { u8 ns_responder:1; u8 echo_responder:1; u8 mld_client:1; |