diff options
author | Arjan van de Ven <arjan@infradead.org> | 2008-10-05 03:35:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-08 20:09:54 -0400 |
commit | ed4cb1337b7c23b91a0f01f661c3f004fc3d3c1a (patch) | |
tree | 47c7c9ea8e294004a98563c45385841cae13b983 | |
parent | 21ce4ffb333e169650a0a05013a8cd3a5b459a67 (diff) |
netdev: uniquify the tx_timeout name
there's several drivers that have use "tx_timeout" for the .. tx
timeout function. All fine with that, they're static, however for
doing stats on how often which driver hits the timeout it's a tad
unfortunate. The patch below gives the ones I found in the
kerneloops.org database unique names.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/fealnx.c | 6 | ||||
-rw-r--r-- | drivers/net/natsemi.c | 8 | ||||
-rw-r--r-- | drivers/net/pcmcia/xirc2ps_cs.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 3c1364de2b66..b455ae931f7a 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -431,7 +431,7 @@ static void getlinktype(struct net_device *dev); | |||
431 | static void getlinkstatus(struct net_device *dev); | 431 | static void getlinkstatus(struct net_device *dev); |
432 | static void netdev_timer(unsigned long data); | 432 | static void netdev_timer(unsigned long data); |
433 | static void reset_timer(unsigned long data); | 433 | static void reset_timer(unsigned long data); |
434 | static void tx_timeout(struct net_device *dev); | 434 | static void fealnx_tx_timeout(struct net_device *dev); |
435 | static void init_ring(struct net_device *dev); | 435 | static void init_ring(struct net_device *dev); |
436 | static int start_tx(struct sk_buff *skb, struct net_device *dev); | 436 | static int start_tx(struct sk_buff *skb, struct net_device *dev); |
437 | static irqreturn_t intr_handler(int irq, void *dev_instance); | 437 | static irqreturn_t intr_handler(int irq, void *dev_instance); |
@@ -658,7 +658,7 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev, | |||
658 | dev->set_multicast_list = &set_rx_mode; | 658 | dev->set_multicast_list = &set_rx_mode; |
659 | dev->do_ioctl = &mii_ioctl; | 659 | dev->do_ioctl = &mii_ioctl; |
660 | dev->ethtool_ops = &netdev_ethtool_ops; | 660 | dev->ethtool_ops = &netdev_ethtool_ops; |
661 | dev->tx_timeout = &tx_timeout; | 661 | dev->tx_timeout = &fealnx_tx_timeout; |
662 | dev->watchdog_timeo = TX_TIMEOUT; | 662 | dev->watchdog_timeo = TX_TIMEOUT; |
663 | 663 | ||
664 | err = register_netdev(dev); | 664 | err = register_netdev(dev); |
@@ -1198,7 +1198,7 @@ static void reset_timer(unsigned long data) | |||
1198 | } | 1198 | } |
1199 | 1199 | ||
1200 | 1200 | ||
1201 | static void tx_timeout(struct net_device *dev) | 1201 | static void fealnx_tx_timeout(struct net_device *dev) |
1202 | { | 1202 | { |
1203 | struct netdev_private *np = netdev_priv(dev); | 1203 | struct netdev_private *np = netdev_priv(dev); |
1204 | void __iomem *ioaddr = np->mem; | 1204 | void __iomem *ioaddr = np->mem; |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index b238ed0e8ace..f7fa3944659b 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -612,7 +612,7 @@ static void undo_cable_magic(struct net_device *dev); | |||
612 | static void check_link(struct net_device *dev); | 612 | static void check_link(struct net_device *dev); |
613 | static void netdev_timer(unsigned long data); | 613 | static void netdev_timer(unsigned long data); |
614 | static void dump_ring(struct net_device *dev); | 614 | static void dump_ring(struct net_device *dev); |
615 | static void tx_timeout(struct net_device *dev); | 615 | static void ns_tx_timeout(struct net_device *dev); |
616 | static int alloc_ring(struct net_device *dev); | 616 | static int alloc_ring(struct net_device *dev); |
617 | static void refill_rx(struct net_device *dev); | 617 | static void refill_rx(struct net_device *dev); |
618 | static void init_ring(struct net_device *dev); | 618 | static void init_ring(struct net_device *dev); |
@@ -920,7 +920,7 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev, | |||
920 | dev->set_multicast_list = &set_rx_mode; | 920 | dev->set_multicast_list = &set_rx_mode; |
921 | dev->change_mtu = &natsemi_change_mtu; | 921 | dev->change_mtu = &natsemi_change_mtu; |
922 | dev->do_ioctl = &netdev_ioctl; | 922 | dev->do_ioctl = &netdev_ioctl; |
923 | dev->tx_timeout = &tx_timeout; | 923 | dev->tx_timeout = &ns_tx_timeout; |
924 | dev->watchdog_timeo = TX_TIMEOUT; | 924 | dev->watchdog_timeo = TX_TIMEOUT; |
925 | 925 | ||
926 | #ifdef CONFIG_NET_POLL_CONTROLLER | 926 | #ifdef CONFIG_NET_POLL_CONTROLLER |
@@ -1875,7 +1875,7 @@ static void dump_ring(struct net_device *dev) | |||
1875 | } | 1875 | } |
1876 | } | 1876 | } |
1877 | 1877 | ||
1878 | static void tx_timeout(struct net_device *dev) | 1878 | static void ns_tx_timeout(struct net_device *dev) |
1879 | { | 1879 | { |
1880 | struct netdev_private *np = netdev_priv(dev); | 1880 | struct netdev_private *np = netdev_priv(dev); |
1881 | void __iomem * ioaddr = ns_ioaddr(dev); | 1881 | void __iomem * ioaddr = ns_ioaddr(dev); |
@@ -3232,7 +3232,7 @@ static void __devexit natsemi_remove1 (struct pci_dev *pdev) | |||
3232 | * suspend/resume synchronization: | 3232 | * suspend/resume synchronization: |
3233 | * entry points: | 3233 | * entry points: |
3234 | * netdev_open, netdev_close, netdev_ioctl, set_rx_mode, intr_handler, | 3234 | * netdev_open, netdev_close, netdev_ioctl, set_rx_mode, intr_handler, |
3235 | * start_tx, tx_timeout | 3235 | * start_tx, ns_tx_timeout |
3236 | * | 3236 | * |
3237 | * No function accesses the hardware without checking np->hands_off. | 3237 | * No function accesses the hardware without checking np->hands_off. |
3238 | * the check occurs under spin_lock_irq(&np->lock); | 3238 | * the check occurs under spin_lock_irq(&np->lock); |
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c index f6c4698ce738..c33a3d523566 100644 --- a/drivers/net/pcmcia/xirc2ps_cs.c +++ b/drivers/net/pcmcia/xirc2ps_cs.c | |||
@@ -353,7 +353,7 @@ typedef struct local_info_t { | |||
353 | * Some more prototypes | 353 | * Some more prototypes |
354 | */ | 354 | */ |
355 | static int do_start_xmit(struct sk_buff *skb, struct net_device *dev); | 355 | static int do_start_xmit(struct sk_buff *skb, struct net_device *dev); |
356 | static void do_tx_timeout(struct net_device *dev); | 356 | static void xirc_tx_timeout(struct net_device *dev); |
357 | static void xirc2ps_tx_timeout_task(struct work_struct *work); | 357 | static void xirc2ps_tx_timeout_task(struct work_struct *work); |
358 | static struct net_device_stats *do_get_stats(struct net_device *dev); | 358 | static struct net_device_stats *do_get_stats(struct net_device *dev); |
359 | static void set_addresses(struct net_device *dev); | 359 | static void set_addresses(struct net_device *dev); |
@@ -590,7 +590,7 @@ xirc2ps_probe(struct pcmcia_device *link) | |||
590 | dev->open = &do_open; | 590 | dev->open = &do_open; |
591 | dev->stop = &do_stop; | 591 | dev->stop = &do_stop; |
592 | #ifdef HAVE_TX_TIMEOUT | 592 | #ifdef HAVE_TX_TIMEOUT |
593 | dev->tx_timeout = do_tx_timeout; | 593 | dev->tx_timeout = xirc_tx_timeout; |
594 | dev->watchdog_timeo = TX_TIMEOUT; | 594 | dev->watchdog_timeo = TX_TIMEOUT; |
595 | INIT_WORK(&local->tx_timeout_task, xirc2ps_tx_timeout_task); | 595 | INIT_WORK(&local->tx_timeout_task, xirc2ps_tx_timeout_task); |
596 | #endif | 596 | #endif |
@@ -1335,7 +1335,7 @@ xirc2ps_tx_timeout_task(struct work_struct *work) | |||
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | static void | 1337 | static void |
1338 | do_tx_timeout(struct net_device *dev) | 1338 | xirc_tx_timeout(struct net_device *dev) |
1339 | { | 1339 | { |
1340 | local_info_t *lp = netdev_priv(dev); | 1340 | local_info_t *lp = netdev_priv(dev); |
1341 | lp->stats.tx_errors++; | 1341 | lp->stats.tx_errors++; |