ramips: collect rx related members to fe_rx_ring struct

[openwrt/svn-archive/archive.git] / target / linux / ramips / files / drivers / net / ethernet / ralink / ralink_soc_eth.h

diff --git a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
index 5d4220f4219f3f92139ce4931237a704bb95cee5..78e04b025ef8cec1c5eafc0c4144ac118dacde26 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
+++ b/target/linux/ramips/files/drivers/net/ethernet/ralink/ralink_soc_eth.h
@@ -465,6 +465,17 @@ struct fe_tx_ring
        u16 tx_thresh;
 };
 
+struct fe_rx_ring
+{
+       struct fe_rx_dma *rx_dma;
+       u8 **rx_data;
+       dma_addr_t rx_phys;
+       u16 rx_ring_size;
+       u16 frag_size;
+       u16 rx_buf_size;
+       u16 rx_calc_idx;
+};
+
 struct fe_priv
 {
        spinlock_t                      page_lock;
@@ -477,11 +488,7 @@ struct fe_priv
        struct device                   *device;
        unsigned long                   sysclk;
 
-       u16                             frag_size;
-       u16                             rx_buf_size;
-       struct fe_rx_dma                *rx_dma;
-       u8                              **rx_data;
-       dma_addr_t                      rx_phys;
+       struct fe_rx_ring               rx_ring;
        struct napi_struct              rx_napi;
 
        struct fe_tx_ring               tx_ring;
@@ -497,7 +504,6 @@ struct fe_priv
        unsigned long                   vlan_map;
        struct work_struct              pending_work;
        DECLARE_BITMAP(pending_flags, FE_FLAG_MAX);
-       u16                             rx_ring_size;
 };
 
 extern const struct of_device_id of_fe_match[];