]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
atl1: change tpd_avail function name
authorJay Cliburn <jacliburn@bellsouth.net>
Thu, 19 Jul 2007 23:45:10 +0000 (18:45 -0500)
committerJeff Garzik <jeff@garzik.org>
Tue, 24 Jul 2007 20:28:40 +0000 (16:28 -0400)
Change tpd_avail() to atl1_tpd_avail().

Signed-off-by: Jay Cliburn <jacliburn@bellsouth.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
drivers/net/atl1/atl1_main.c

index fd1e156f1747fcfa63999928edeb644c038faf33..79d60e14775c8c99a8b732191c8fbf785f5d006a 100644 (file)
@@ -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);