aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorJay Cliburn <jacliburn@bellsouth.net>2007-07-19 18:45:10 -0500
committerJeff Garzik <jeff@garzik.org>2007-07-24 16:28:40 -0400
commite6a7ff4a617ad3f6a59e2576d430b9292299d067 (patch)
tree17754a667c17893940010804ae60512916e8b334 /drivers
parentps3: fix rare issue that reenabling rx DMA fails (diff)
downloadlinux-dev-e6a7ff4a617ad3f6a59e2576d430b9292299d067.tar.xz
linux-dev-e6a7ff4a617ad3f6a59e2576d430b9292299d067.zip
atl1: change tpd_avail function name
Change tpd_avail() to atl1_tpd_avail(). Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net> Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/atl1/atl1_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/atl1/atl1_main.c b/drivers/net/atl1/atl1_main.c
index fd1e156f1747..79d60e14775c 100644
--- a/drivers/net/atl1/atl1_main.c
+++ b/drivers/net/atl1/atl1_main.c
@@ -1422,7 +1422,7 @@ static void atl1_intr_tx(struct atl1_adapter *adapter)
netif_wake_queue(adapter->netdev);
}
-static u16 tpd_avail(struct atl1_tpd_ring *tpd_ring)
+static u16 atl1_tpd_avail(struct atl1_tpd_ring *tpd_ring)
{
u16 next_to_clean = atomic_read(&tpd_ring->next_to_clean);
u16 next_to_use = atomic_read(&tpd_ring->next_to_use);
@@ -1708,7 +1708,7 @@ static int atl1_xmit_frame(struct sk_buff *skb, struct net_device *netdev)
return NETDEV_TX_LOCKED;
}
- if (tpd_avail(&adapter->tpd_ring) < count) {
+ if (atl1_tpd_avail(&adapter->tpd_ring) < count) {
/* not enough descriptors */
netif_stop_queue(netdev);
spin_unlock_irqrestore(&adapter->lock, flags);