ramips: rename the spi driver

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

diff --git a/target/linux/ramips/files/drivers/net/ramips_eth.h b/target/linux/ramips/files/drivers/net/ramips_eth.h
index a69754b77aad5e572348d3bd76abb33ea077bd7b..1d151df687aee86af9591fa9ea8c293cb663d70e 100644 (file)
--- a/target/linux/ramips/files/drivers/net/ramips_eth.h
+++ b/target/linux/ramips/files/drivers/net/ramips_eth.h
@@ -195,7 +195,7 @@ struct ramips_rx_dma {
        unsigned int rxd2;
        unsigned int rxd3;
        unsigned int rxd4;
-};
+} __packed __aligned(4);
 
 #define TX_DMA_PLEN0_MASK              ((0x3fff) << 16)
 #define TX_DMA_PLEN0(_x)               (((_x) & 0x3fff) << 16)
@@ -211,7 +211,7 @@ struct ramips_tx_dma {
        unsigned int txd2;
        unsigned int txd3;
        unsigned int txd4;
-};
+} __packed __aligned(4);
 
 struct raeth_priv
 {
@@ -219,6 +219,7 @@ struct raeth_priv
        struct tasklet_struct   rx_tasklet;
        struct ramips_rx_dma    *rx;
        struct sk_buff          *rx_skb[NUM_RX_DESC];
+       dma_addr_t              rx_dma[NUM_RX_DESC];
 
        dma_addr_t              tx_desc_dma;
        struct tasklet_struct   tx_housekeeping_tasklet;
@@ -228,12 +229,20 @@ struct raeth_priv
        unsigned int            skb_free_idx;
 
        spinlock_t              page_lock;
+       struct net_device       *netdev;
+       struct device           *parent;
        struct ramips_eth_platform_data *plat;
 
+       int                     link;
        int                     speed;
        int                     duplex;
        int                     tx_fc;
        int                     rx_fc;
+
+       struct mii_bus          *mii_bus;
+       int                     mii_irq[PHY_MAX_ADDR];
+       struct phy_device       *phy_dev;
+       spinlock_t              phy_lock;
 };
 
 #endif /* RAMIPS_ETH_H */