Commit c40d2015 authored by Igor Russkikh's avatar Igor Russkikh Committed by David S. Miller
Browse files

net: aquantia: Remove duplicate hardware descriptors declarations 



Signed-off-by: default avatarIgor Russkikh <igor.russkikh@aquantia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1a713f87

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0_internal.h

+0 −31
Original line number Diff line number Diff line
@@ -88,37 +88,6 @@ 


#define HW_ATL_A0_FW_VER_EXPECTED 0x01050006U



/* Hardware tx descriptor */

struct __packed hw_atl_txd_s {

	u64 buf_addr;

	u32 ctl;

	u32 ctl2; /* 63..46 - payload length, 45 - ctx enable, 44 - ctx index */

};



/* Hardware tx context descriptor */

struct __packed hw_atl_txc_s {

	u32 rsvd;

	u32 len;

	u32 ctl;

	u32 len2;

};



/* Hardware rx descriptor */

struct __packed hw_atl_rxd_s {

	u64 buf_addr;

	u64 hdr_addr;

};



/* Hardware rx descriptor writeback */

struct __packed hw_atl_rxd_wb_s {

	u32 type;

	u32 rss_hash;

	u16 status;

	u16 pkt_len;

	u16 next_desc_ptr;

	u16 vlan;

};



/* HW layer capabilities */

static struct aq_hw_caps_s hw_atl_a0_hw_caps_ = {

	.ports = 1U,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0_internal.h

+0 −31
Original line number Diff line number Diff line
@@ -142,37 +142,6 @@ 
#define HW_ATL_INTR_MODER_MAX  0x1FF

#define HW_ATL_INTR_MODER_MIN  0xFF



/* Hardware tx descriptor */

struct __packed hw_atl_txd_s {

	u64 buf_addr;

	u32 ctl;

	u32 ctl2; /* 63..46 - payload length, 45 - ctx enable, 44 - ctx index */

};



/* Hardware tx context descriptor */

struct __packed hw_atl_txc_s {

	u32 rsvd;

	u32 len;

	u32 ctl;

	u32 len2;

};



/* Hardware rx descriptor */

struct __packed hw_atl_rxd_s {

	u64 buf_addr;

	u64 hdr_addr;

};



/* Hardware rx descriptor writeback */

struct __packed hw_atl_rxd_wb_s {

	u32 type;

	u32 rss_hash;

	u16 status;

	u16 pkt_len;

	u16 next_desc_ptr;

	u16 vlan;

};



/* HW layer capabilities */

static struct aq_hw_caps_s hw_atl_b0_hw_caps_ = {

	.ports = 1U,

drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_utils.h

+31 −0
Original line number Diff line number Diff line
@@ -16,6 +16,37 @@ 


#define HW_ATL_FLUSH() { (void)aq_hw_read_reg(self, 0x10); }



/* Hardware tx descriptor */

struct __packed hw_atl_txd_s {

	u64 buf_addr;

	u32 ctl;

	u32 ctl2; /* 63..46 - payload length, 45 - ctx enable, 44 - ctx index */

};



/* Hardware tx context descriptor */

struct __packed hw_atl_txc_s {

	u32 rsvd;

	u32 len;

	u32 ctl;

	u32 len2;

};



/* Hardware rx descriptor */

struct __packed hw_atl_rxd_s {

	u64 buf_addr;

	u64 hdr_addr;

};



/* Hardware rx descriptor writeback */

struct __packed hw_atl_rxd_wb_s {

	u32 type;

	u32 rss_hash;

	u16 status;

	u16 pkt_len;

	u16 next_desc_ptr;

	u16 vlan;

};



struct __packed hw_atl_stats_s {

	u32 uprc;

	u32 mprc;