diff options
Diffstat (limited to 'drivers/net/wan/hd64570.c')
| -rw-r--r-- | drivers/net/wan/hd64570.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/wan/hd64570.c b/drivers/net/wan/hd64570.c index a3ea27ce04f..33e920aa3a7 100644 --- a/drivers/net/wan/hd64570.c +++ b/drivers/net/wan/hd64570.c @@ -104,7 +104,7 @@ static inline u16 desc_abs_number(port_t *port, u16 desc, int transmit) } -static inline u16 desc_offset(port_t *port, u16 desc, int transmit) +static inline u16 hd_desc_offset(port_t *port, u16 desc, int transmit) { /* Descriptor offset always fits in 16 bits */ return desc_abs_number(port, desc, transmit) * sizeof(pkt_desc); @@ -116,10 +116,10 @@ static inline pkt_desc __iomem *desc_address(port_t *port, u16 desc, { #ifdef PAGE0_ALWAYS_MAPPED return (pkt_desc __iomem *)(win0base(port_to_card(port)) - + desc_offset(port, desc, transmit)); + + hd_desc_offset(port, desc, transmit)); #else return (pkt_desc __iomem *)(winbase(port_to_card(port)) - + desc_offset(port, desc, transmit)); + + hd_desc_offset(port, desc, transmit)); #endif } @@ -169,7 +169,7 @@ static void sca_init_port(port_t *port) for (i = 0; i < buffs; i++) { pkt_desc __iomem *desc = desc_address(port, i, transmit); - u16 chain_off = desc_offset(port, i + 1, transmit); + u16 chain_off = hd_desc_offset(port, i + 1, transmit); u32 buff_off = buffer_offset(port, i, transmit); writew(chain_off, &desc->cp); @@ -187,12 +187,12 @@ static void sca_init_port(port_t *port) /* current desc addr */ sca_out(0, dmac + CPB, card); /* pointer base */ - sca_outw(desc_offset(port, 0, transmit), dmac + CDAL, card); + sca_outw(hd_desc_offset(port, 0, transmit), dmac + CDAL, card); if (!transmit) - sca_outw(desc_offset(port, buffs - 1, transmit), + sca_outw(hd_desc_offset(port, buffs - 1, transmit), dmac + EDAL, card); else - sca_outw(desc_offset(port, 0, transmit), dmac + EDAL, + sca_outw(hd_desc_offset(port, 0, transmit), dmac + EDAL, card); /* clear frame end interrupt counter */ @@ -305,7 +305,7 @@ static inline void sca_rx_intr(port_t *port) dev->stats.rx_over_errors++; while (1) { - u32 desc_off = desc_offset(port, port->rxin, 0); + u32 desc_off = hd_desc_offset(port, port->rxin, 0); pkt_desc __iomem *desc; u32 cda = sca_inw(dmac + CDAL, card); @@ -359,7 +359,7 @@ static inline void sca_tx_intr(port_t *port) while (1) { pkt_desc __iomem *desc; - u32 desc_off = desc_offset(port, port->txlast, 1); + u32 desc_off = hd_desc_offset(port, port->txlast, 1); u32 cda = sca_inw(dmac + CDAL, card); if ((cda >= desc_off) && (cda < desc_off + sizeof(pkt_desc))) break; /* Transmitter is/will_be sending this frame */ @@ -660,7 +660,7 @@ static netdev_tx_t sca_xmit(struct sk_buff *skb, struct net_device *dev) writeb(ST_TX_EOM, &desc->stat); port->txin = next_desc(port, port->txin, 1); - sca_outw(desc_offset(port, port->txin, 1), + sca_outw(hd_desc_offset(port, port->txin, 1), get_dmac_tx(port) + EDAL, card); sca_out(DSR_DE, DSR_TX(phy_node(port)), card); /* Enable TX DMA */ |