e1000: remove risky prefetch on next_skb->data

[linux-2.6-omap-h63xx.git] / drivers / net / 8139too.c

diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index e58d4c50c2e1dde2712e0d3b160bbb5bd1dc12b3..feae7832fc846b3daef50d83d5cf0184561b9484 100644 (file)
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -1131,7 +1131,7 @@ static void __devexit rtl8139_remove_one (struct pci_dev *pdev)
    No extra delay is needed with 33Mhz PCI, but 66Mhz may change this.
  */
 
-#define eeprom_delay() RTL_R32(Cfg9346)
+#define eeprom_delay() (void)RTL_R32(Cfg9346)
 
 /* The EEPROM commands include the alway-set leading bit. */
 #define EE_WRITE_CMD   (5)
@@ -1605,7 +1605,7 @@ static void rtl8139_thread (void *_data)
        if (tp->watchdog_fired) {
                tp->watchdog_fired = 0;
                rtl8139_tx_timeout_task(_data);
-       } else if (rtnl_shlock_nowait() == 0) {
+       } else if (rtnl_trylock()) {
                rtl8139_thread_iter (dev, tp, tp->mmio_addr);
                rtnl_unlock ();
        } else {