diff options
author | Ingo Molnar | 2015-09-30 09:29:27 +0200 |
---|---|---|
committer | Ingo Molnar | 2015-09-30 09:29:27 +0200 |
commit | ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc (patch) | |
tree | e9b0f1a4c2f324c6fb107e276b09894ae480baa6 /drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | |
parent | x86/hyperv: Fix the build in the !CONFIG_KEXEC_CORE case (diff) | |
parent | Linux 4.3-rc3 (diff) | |
download | kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.tar.gz kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.tar.xz kernel-qcow2-linux-ccf79c238f1a06a801b4c4449b9bc8a42be2c7bc.zip |
Merge tag 'v4.3-rc3' into x86/urgent, before applying dependent fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnx2x/bnx2x.h')
-rw-r--r-- | drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h index ba936635322a..b5e64b02200c 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h @@ -1946,6 +1946,7 @@ struct bnx2x { u16 vlan_cnt; u16 vlan_credit; u16 vxlan_dst_port; + u8 vxlan_dst_port_count; bool accept_any_vlan; }; |