renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 17:53:56 +08:00
Code

r6040: define and use MTPR transmit enable bit

Browse Source 
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>
This commit is contained in:
Florian Fainelli 2012-04-11 07:18:41 +00:00 committed by David S. Miller
parent 8dd87a26c7
commit 940ff7ed0e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/rdc/r6040.c
View File

@ -74,6 +74,7 @@
#define MT_ICR 0x0C /* TX interrupt control */ #define MT_ICR 0x0C /* TX interrupt control */
#define MR_ICR 0x10 /* RX interrupt control */ #define MR_ICR 0x10 /* RX interrupt control */
#define MTPR 0x14 /* TX poll command register */ #define MTPR 0x14 /* TX poll command register */
#define TM2TX 0x0001 /* Trigger MAC to transmit */
#define MR_BSR 0x18 /* RX buffer size */ #define MR_BSR 0x18 /* RX buffer size */
#define MR_DCR 0x1A /* RX descriptor control */ #define MR_DCR 0x1A /* RX descriptor control */
#define MLSR 0x1C /* Last status */ #define MLSR 0x1C /* Last status */
@ -420,7 +421,7 @@ static void r6040_init_mac_regs(struct net_device *dev)
/* Let TX poll the descriptors /* Let TX poll the descriptors
* we may got called by r6040_tx_timeout which has left * we may got called by r6040_tx_timeout which has left
* some unsent tx buffers */ * some unsent tx buffers */
iowrite16(0x01, ioaddr + MTPR); iowrite16(TM2TX, ioaddr + MTPR);
} }
static void r6040_tx_timeout(struct net_device *dev) 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); skb_tx_timestamp(skb);
/* Trigger the MAC to check the TX descriptor */ /* Trigger the MAC to check the TX descriptor */
iowrite16(0x01, ioaddr + MTPR); iowrite16(TM2TX, ioaddr + MTPR);
lp->tx_insert_ptr = descptr->vndescp; lp->tx_insert_ptr = descptr->vndescp;
/* If no tx resource, stop */ /* If no tx resource, stop */