Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / net / eepro.c

diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 8d97f168f018734bcaeb1af1372b77ba9fca2eef..7c826319ee5a153111a59a1c517992dadcd5a84e 100644 (file)
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -1457,11 +1457,11 @@ hardware_send_packet(struct net_device *dev, void *buf, short length)
        if (net_debug > 5)
                printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name);
 
-               /* determine how much of the transmit buffer space is available */
-               if (lp->tx_end > lp->tx_start)
+       /* determine how much of the transmit buffer space is available */
+       if (lp->tx_end > lp->tx_start)
                tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start);
-               else if (lp->tx_end < lp->tx_start)
-                       tx_available = lp->tx_start - lp->tx_end;
+       else if (lp->tx_end < lp->tx_start)
+               tx_available = lp->tx_start - lp->tx_end;
        else tx_available = lp->xmt_ram;
 
        if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) {