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 /drivers/net/fealnx.c | |
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>
Diffstat (limited to 'drivers/net/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 6 |
1 files changed, 3 insertions, 3 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; |