aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@infradead.org>2008-10-05 03:35:05 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-08 20:09:54 -0400
commited4cb1337b7c23b91a0f01f661c3f004fc3d3c1a (patch)
tree47c7c9ea8e294004a98563c45385841cae13b983 /drivers/net/pcmcia
parent21ce4ffb333e169650a0a05013a8cd3a5b459a67 (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/pcmcia')
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c6
1 files changed, 3 insertions, 3 deletions
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 */
355static int do_start_xmit(struct sk_buff *skb, struct net_device *dev); 355static int do_start_xmit(struct sk_buff *skb, struct net_device *dev);
356static void do_tx_timeout(struct net_device *dev); 356static void xirc_tx_timeout(struct net_device *dev);
357static void xirc2ps_tx_timeout_task(struct work_struct *work); 357static void xirc2ps_tx_timeout_task(struct work_struct *work);
358static struct net_device_stats *do_get_stats(struct net_device *dev); 358static struct net_device_stats *do_get_stats(struct net_device *dev);
359static void set_addresses(struct net_device *dev); 359static 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
1337static void 1337static void
1338do_tx_timeout(struct net_device *dev) 1338xirc_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++;