diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-27 21:06:39 -0700 |
| commit | d96ff269a04be286989ead13bf8b4be55bdee8ee (patch) | |
| tree | 46b6d010a9a4dfe96dc86339d1cbded8874c6b8f /drivers/net/ethernet/aquantia/atlantic/aq_nic.h | |
| parent | Merge branch 'nfp-extend-flower-capabilities-for-GRE-tunnel-offload' (diff) | |
| parent | Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux (diff) | |
| download | linux-dev-d96ff269a04be286989ead13bf8b4be55bdee8ee.tar.xz linux-dev-d96ff269a04be286989ead13bf8b4be55bdee8ee.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
The new route handling in ip_mc_finish_output() from 'net' overlapped
with the new support for returning congestion notifications from BPF
programs.
In order to handle this I had to take the dev_loopback_xmit() calls
out of the switch statement.
The aquantia driver conflicts were simple overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/aquantia/atlantic/aq_nic.h')
| -rw-r--r-- | drivers/net/ethernet/aquantia/atlantic/aq_nic.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h index 26c72f298684..255b54a6ae07 100644 --- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.h +++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.h @@ -37,6 +37,7 @@ struct aq_nic_cfg_s { u32 wol; u8 is_vlan_rx_strip; u8 is_vlan_tx_insert; + bool is_vlan_force_promisc; u16 is_mc_list_enabled; u16 mc_list_count; bool is_autoneg; |