diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-11-07 19:54:43 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-11-07 19:54:43 -0800 |
| commit | a9ae168303e1d88bce686d89e67562a851780658 (patch) | |
| tree | 2d3185fc830f901897361515b8e2edd711bfc3d3 /drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | |
| parent | Merge branch 'mlxsw-Add-layer-3-devlink-trap-support' (diff) | |
| parent | net: atlantic: change email domains to Marvell (diff) | |
| download | linux-dev-a9ae168303e1d88bce686d89e67562a851780658.tar.xz linux-dev-a9ae168303e1d88bce686d89e67562a851780658.zip | |
Merge branch 'aquantia-next'
Igor Russkikh says:
====================
Aquantia Marvell atlantic driver updates 11-2019
Here is a bunch of atlantic driver new features and updates.
Shortlist:
- Me adding ethtool private flags for various loopback test modes,
- Nikita is doing some work here on power management, implementing new PM API,
He also did some checkpatch style cleanup of older driver parts.
- I'm also adding a new UDP GSO offload support and flags for loopback activation
- We are now Marvell, so I am changing email addresses on maintainers list.
v2: styling, ip6 correct handling in udpgso
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_cfg.h')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h index 8c633caf79d2..f0c41f7408e5 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h @@ -70,14 +70,11 @@ /*#define AQ_CFG_MAC_ADDR_PERMANENT {0x30, 0x0E, 0xE3, 0x12, 0x34, 0x56}*/ -#define AQ_NIC_FC_OFF 0U -#define AQ_NIC_FC_TX 1U -#define AQ_NIC_FC_RX 2U -#define AQ_NIC_FC_FULL 3U -#define AQ_NIC_FC_AUTO 4U - #define AQ_CFG_FC_MODE AQ_NIC_FC_FULL +/* Default WOL modes used on initialization */ +#define AQ_CFG_WOL_MODES WAKE_MAGIC + #define AQ_CFG_SPEED_MSK 0xFFFFU /* 0xFFFFU==auto_neg */ #define AQ_CFG_IS_AUTONEG_DEF 1U |