Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 142085 | Differences between
and this patch

Collapse All | Expand All

(-)linux-2.6.17-gentoo-r4_orig/drivers/net/pcmcia/xirc2ps_cs.c (-2 / +12 lines)
Lines 345-350 Link Here
345
    void __iomem *dingo_ccr; /* only used for CEM56 cards */
345
    void __iomem *dingo_ccr; /* only used for CEM56 cards */
346
    unsigned last_ptr_value; /* last packets transmitted value */
346
    unsigned last_ptr_value; /* last packets transmitted value */
347
    const char *manf_str;
347
    const char *manf_str;
348
    struct work_struct tx_timeout_task;
348
} local_info_t;
349
} local_info_t;
349
350
350
/****************
351
/****************
Lines 1339-1347 Link Here
1339
} /* xirc2ps_interrupt */
1340
} /* xirc2ps_interrupt */
1340
1341
1341
/*====================================================================*/
1342
/*====================================================================*/
1342
1343
static void
1343
static void
1344
do_tx_timeout(struct net_device *dev)
1344
xirc2ps_tx_timeout_task(struct net_device *dev)
1345
{
1345
{
1346
    local_info_t *lp = netdev_priv(dev);
1346
    local_info_t *lp = netdev_priv(dev);
1347
    printk(KERN_NOTICE "%s: transmit timed out\n", dev->name);
1347
    printk(KERN_NOTICE "%s: transmit timed out\n", dev->name);
Lines 1351-1356 Link Here
1351
    dev->trans_start = jiffies;
1351
    dev->trans_start = jiffies;
1352
    netif_wake_queue(dev);
1352
    netif_wake_queue(dev);
1353
}
1353
}
1354
static void
1355
do_tx_timeout(struct net_device *dev)
1356
{
1357
    local_info_t *lp = netdev_priv(dev);
1358
    schedule_work(&lp->tx_timeout_task);
1359
}
1360
1354
1361
1355
static int
1362
static int
1356
do_start_xmit(struct sk_buff *skb, struct net_device *dev)
1363
do_start_xmit(struct sk_buff *skb, struct net_device *dev)
Lines 1528-1533 Link Here
1528
    if (!pcmcia_dev_present(link))
1535
    if (!pcmcia_dev_present(link))
1529
	return -ENODEV;
1536
	return -ENODEV;
1530
1537
1538
    INIT_WORK(&lp->tx_timeout_task,
1539
	(void (*)(void *))xirc2ps_tx_timeout_task, dev);
1540
1531
    /* okay */
1541
    /* okay */
1532
    link->open++;
1542
    link->open++;
1533
1543

Return to bug 142085