|
@@ -334,8 +334,6 @@ enum state_values {
|
|
#define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
|
|
#define TYPHOON_RESET_TIMEOUT_NOSLEEP ((6 * 1000000) / TYPHOON_UDELAY)
|
|
#define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
|
|
#define TYPHOON_WAIT_TIMEOUT ((1000000 / 2) / TYPHOON_UDELAY)
|
|
|
|
|
|
-#define typhoon_synchronize_irq(x) synchronize_irq(x)
|
|
|
|
-
|
|
|
|
#if defined(NETIF_F_TSO)
|
|
#if defined(NETIF_F_TSO)
|
|
#define skb_tso_size(x) (skb_shinfo(x)->gso_size)
|
|
#define skb_tso_size(x) (skb_shinfo(x)->gso_size)
|
|
#define TSO_NUM_DESCRIPTORS 2
|
|
#define TSO_NUM_DESCRIPTORS 2
|
|
@@ -2143,7 +2141,6 @@ typhoon_close(struct net_device *dev)
|
|
printk(KERN_ERR "%s: unable to stop runtime\n", dev->name);
|
|
printk(KERN_ERR "%s: unable to stop runtime\n", dev->name);
|
|
|
|
|
|
/* Make sure there is no irq handler running on a different CPU. */
|
|
/* Make sure there is no irq handler running on a different CPU. */
|
|
- typhoon_synchronize_irq(dev->irq);
|
|
|
|
free_irq(dev->irq, dev);
|
|
free_irq(dev->irq, dev);
|
|
|
|
|
|
typhoon_free_rx_rings(tp);
|
|
typhoon_free_rx_rings(tp);
|