|
@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev);
|
|
static void check_link(struct net_device *dev);
|
|
static void check_link(struct net_device *dev);
|
|
static void netdev_timer(unsigned long data);
|
|
static void netdev_timer(unsigned long data);
|
|
static void dump_ring(struct net_device *dev);
|
|
static void dump_ring(struct net_device *dev);
|
|
-static void tx_timeout(struct net_device *dev);
|
|
|
|
|
|
+static void ns_tx_timeout(struct net_device *dev);
|
|
static int alloc_ring(struct net_device *dev);
|
|
static int alloc_ring(struct net_device *dev);
|
|
static void refill_rx(struct net_device *dev);
|
|
static void refill_rx(struct net_device *dev);
|
|
static void init_ring(struct net_device *dev);
|
|
static void init_ring(struct net_device *dev);
|
|
@@ -920,7 +920,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
|
|
dev->set_multicast_list = &set_rx_mode;
|
|
dev->set_multicast_list = &set_rx_mode;
|
|
dev->change_mtu = &natsemi_change_mtu;
|
|
dev->change_mtu = &natsemi_change_mtu;
|
|
dev->do_ioctl = &netdev_ioctl;
|
|
dev->do_ioctl = &netdev_ioctl;
|
|
- dev->tx_timeout = &tx_timeout;
|
|
|
|
|
|
+ dev->tx_timeout = &ns_tx_timeout;
|
|
dev->watchdog_timeo = TX_TIMEOUT;
|
|
dev->watchdog_timeo = TX_TIMEOUT;
|
|
|
|
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
#ifdef CONFIG_NET_POLL_CONTROLLER
|
|
@@ -1875,7 +1875,7 @@ static void dump_ring(struct net_device *dev)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-static void tx_timeout(struct net_device *dev)
|
|
|
|
|
|
+static void ns_tx_timeout(struct net_device *dev)
|
|
{
|
|
{
|
|
struct netdev_private *np = netdev_priv(dev);
|
|
struct netdev_private *np = netdev_priv(dev);
|
|
void __iomem * ioaddr = ns_ioaddr(dev);
|
|
void __iomem * ioaddr = ns_ioaddr(dev);
|
|
@@ -3232,7 +3232,7 @@ static void __devexit natsemi_remove1 (struct pci_dev *pdev)
|
|
* suspend/resume synchronization:
|
|
* suspend/resume synchronization:
|
|
* entry points:
|
|
* entry points:
|
|
* netdev_open, netdev_close, netdev_ioctl, set_rx_mode, intr_handler,
|
|
* netdev_open, netdev_close, netdev_ioctl, set_rx_mode, intr_handler,
|
|
- * start_tx, tx_timeout
|
|
|
|
|
|
+ * start_tx, ns_tx_timeout
|
|
*
|
|
*
|
|
* No function accesses the hardware without checking np->hands_off.
|
|
* No function accesses the hardware without checking np->hands_off.
|
|
* the check occurs under spin_lock_irq(&np->lock);
|
|
* the check occurs under spin_lock_irq(&np->lock);
|