diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-10-30 04:43:08 -0400 |
| commit | 169ed55bd30305b933f52bfab32a58671d44ab68 (patch) | |
| tree | 32e280957474f458901abfce16fa2a1687ef7497 /drivers/net/eepro.c | |
| parent | 3d7851b3cdd43a734e5cc4c643fd886ab28ad4d5 (diff) | |
| parent | 45f81b1c96d9793e47ce925d257ea693ce0b193e (diff) | |
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/urgent
Diffstat (limited to 'drivers/net/eepro.c')
| -rw-r--r-- | drivers/net/eepro.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c index 8d97f168f018..7c826319ee5a 100644 --- 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) | |||
| 1457 | if (net_debug > 5) | 1457 | if (net_debug > 5) |
| 1458 | printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name); | 1458 | printk(KERN_DEBUG "%s: entering hardware_send_packet routine.\n", dev->name); |
| 1459 | 1459 | ||
| 1460 | /* determine how much of the transmit buffer space is available */ | 1460 | /* determine how much of the transmit buffer space is available */ |
| 1461 | if (lp->tx_end > lp->tx_start) | 1461 | if (lp->tx_end > lp->tx_start) |
| 1462 | tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start); | 1462 | tx_available = lp->xmt_ram - (lp->tx_end - lp->tx_start); |
| 1463 | else if (lp->tx_end < lp->tx_start) | 1463 | else if (lp->tx_end < lp->tx_start) |
| 1464 | tx_available = lp->tx_start - lp->tx_end; | 1464 | tx_available = lp->tx_start - lp->tx_end; |
| 1465 | else tx_available = lp->xmt_ram; | 1465 | else tx_available = lp->xmt_ram; |
| 1466 | 1466 | ||
| 1467 | if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) { | 1467 | if (((((length + 3) >> 1) << 1) + 2*XMT_HEADER) >= tx_available) { |