net: hisilicon: Add an rx_desc to adapt HI13X1_GMAC

HI13X1 changed the offsets and bitmaps for rx_desc
registers in the same peripheral device on different
models of the hip04_eth.

Signed-off-by: Jiangfeng Xiao <xiaojiangfeng@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hip04_eth.c b/drivers/net/ethernet/hisilicon/hip04_eth.c
index c578934a233680d558c8a12dde055f4a722a446a..780fc462cc366210b54950105859743468f81f7f 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hip04_eth.c
+++ b/drivers/net/ethernet/hisilicon/hip04_eth.c
@@ -171,11 +171,20 @@ struct tx_desc {
 } __aligned(64);
 
 struct rx_desc {
+#if defined(CONFIG_HI13X1_GMAC)
+       u32 reserved1[3];
+       u16 pkt_len;
+       u16 reserved_16;
+       u32 reserved2[6];
+       u32 pkt_err;
+       u32 reserved3[5];
+#else
        u16 reserved_16;
        u16 pkt_len;
        u32 reserve1[3];
        u32 pkt_err;
        u32 reserve2[4];
+#endif
 };
 
 struct hip04_priv {