mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
net: aquantia: Remove duplicate hardware descriptors declarations
Signed-off-by: Igor Russkikh <igor.russkikh@aquantia.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1a713f87a0
commit
c40d20150d
3 changed files with 31 additions and 62 deletions
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue