diff options
| author | Sudarsana Reddy Kalluru | 2018-06-01 03:47:36 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-06-04 16:10:46 +0200 |
| commit | 5e9f20359a166de934b5bd02cb54c0be0e8c2890 (patch) | |
| tree | 838fdbe89d08eb97e260429f70f5cc55c2d6f2a1 /drivers/net/ethernet/qlogic | |
| parent | Merge branch 'selftests-mirror_vlan-fixes' (diff) | |
| download | kernel-qcow2-linux-5e9f20359a166de934b5bd02cb54c0be0e8c2890.tar.gz kernel-qcow2-linux-5e9f20359a166de934b5bd02cb54c0be0e8c2890.tar.xz kernel-qcow2-linux-5e9f20359a166de934b5bd02cb54c0be0e8c2890.zip | |
qed: Fix shared memory inconsistency between driver and the MFW.
The structure shared between driver and management firmware (MFW)
differ in sizes. The additional field defined by the MFW is not
relevant to the current driver. Add a dummy field to the structure.
Fixes: cac6f691 ("qed: Add support for Unified Fabric Port")
Signed-off-by: Sudarsana Reddy Kalluru <Sudarsana.Kalluru@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_hsi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_hsi.h b/drivers/net/ethernet/qlogic/qed/qed_hsi.h index 8e1e6e1eb40e..beba9308011b 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_hsi.h +++ b/drivers/net/ethernet/qlogic/qed/qed_hsi.h @@ -11996,6 +11996,7 @@ struct public_port { #define EEE_REMOTE_TW_RX_MASK 0xffff0000 #define EEE_REMOTE_TW_RX_OFFSET 16 + u32 reserved1; u32 oem_cfg_port; #define OEM_CFG_CHANNEL_TYPE_MASK 0x00000003 #define OEM_CFG_CHANNEL_TYPE_OFFSET 0 |