diff options
| author | Florian Fainelli <florian@openwrt.org> | 2012-04-11 07:18:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-04-12 16:06:24 -0400 |
| commit | 940ff7ed0e2af6410078addead6ca245f55b72da (patch) | |
| tree | 46e4d6b5112cd5213a5f1e81c14f30ec245f4888 /drivers/net/ethernet/rdc | |
| parent | 8dd87a26c7db72ce3124eb20bdbe7394723043fe (diff) | |
| download | talos-obmc-linux-940ff7ed0e2af6410078addead6ca245f55b72da.tar.gz talos-obmc-linux-940ff7ed0e2af6410078addead6ca245f55b72da.zip | |
r6040: define and use MTPR transmit enable bit
Define MTPR bit 0 of the register and use it where it is appropriate.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/rdc')
| -rw-r--r-- | drivers/net/ethernet/rdc/r6040.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index 1a365ae598d6..afa4186cb2be 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c @@ -74,6 +74,7 @@ #define MT_ICR 0x0C /* TX interrupt control */ #define MR_ICR 0x10 /* RX interrupt control */ #define MTPR 0x14 /* TX poll command register */ +#define TM2TX 0x0001 /* Trigger MAC to transmit */ #define MR_BSR 0x18 /* RX buffer size */ #define MR_DCR 0x1A /* RX descriptor control */ #define MLSR 0x1C /* Last status */ @@ -420,7 +421,7 @@ static void r6040_init_mac_regs(struct net_device *dev) /* Let TX poll the descriptors * we may got called by r6040_tx_timeout which has left * some unsent tx buffers */ - iowrite16(0x01, ioaddr + MTPR); + iowrite16(TM2TX, ioaddr + MTPR); } static void r6040_tx_timeout(struct net_device *dev) @@ -844,7 +845,7 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb, skb_tx_timestamp(skb); /* Trigger the MAC to check the TX descriptor */ - iowrite16(0x01, ioaddr + MTPR); + iowrite16(TM2TX, ioaddr + MTPR); lp->tx_insert_ptr = descptr->vndescp; /* If no tx resource, stop */ |
