Commit 2d3ecb5f authored by Joerg Ahrens's avatar Joerg Ahrens Committed by Adrian Bunk

xirc2ps_cs: Cannot reset card in atomic context

I am using a Xircom CEM33 pcmcia NIC which has occasional hardware problems.
If the netdev watchdog detects a transmit timeout, do_reset is called which
msleeps - this is illegal in atomic context.

This patch schedules the timeout handling as a workqueue item.
Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
parent 2a9d7dbf
...@@ -345,6 +345,7 @@ typedef struct local_info_t { ...@@ -345,6 +345,7 @@ typedef struct local_info_t {
void __iomem *dingo_ccr; /* only used for CEM56 cards */ void __iomem *dingo_ccr; /* only used for CEM56 cards */
unsigned last_ptr_value; /* last packets transmitted value */ unsigned last_ptr_value; /* last packets transmitted value */
const char *manf_str; const char *manf_str;
struct work_struct tx_timeout_task;
} local_info_t; } local_info_t;
/**************** /****************
...@@ -352,6 +353,7 @@ typedef struct local_info_t { ...@@ -352,6 +353,7 @@ typedef struct local_info_t {
*/ */
static int do_start_xmit(struct sk_buff *skb, struct net_device *dev); static int do_start_xmit(struct sk_buff *skb, struct net_device *dev);
static void do_tx_timeout(struct net_device *dev); static void do_tx_timeout(struct net_device *dev);
static void xirc2ps_tx_timeout_task(void *data);
static struct net_device_stats *do_get_stats(struct net_device *dev); static struct net_device_stats *do_get_stats(struct net_device *dev);
static void set_addresses(struct net_device *dev); static void set_addresses(struct net_device *dev);
static void set_multicast_list(struct net_device *dev); static void set_multicast_list(struct net_device *dev);
...@@ -591,6 +593,7 @@ xirc2ps_attach(struct pcmcia_device *p_dev) ...@@ -591,6 +593,7 @@ xirc2ps_attach(struct pcmcia_device *p_dev)
#ifdef HAVE_TX_TIMEOUT #ifdef HAVE_TX_TIMEOUT
dev->tx_timeout = do_tx_timeout; dev->tx_timeout = do_tx_timeout;
dev->watchdog_timeo = TX_TIMEOUT; dev->watchdog_timeo = TX_TIMEOUT;
INIT_WORK(&local->tx_timeout_task, xirc2ps_tx_timeout_task, dev);
#endif #endif
link->handle = p_dev; link->handle = p_dev;
...@@ -1374,17 +1377,24 @@ xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs) ...@@ -1374,17 +1377,24 @@ xirc2ps_interrupt(int irq, void *dev_id, struct pt_regs *regs)
/*====================================================================*/ /*====================================================================*/
static void static void
do_tx_timeout(struct net_device *dev) xirc2ps_tx_timeout_task(void *data)
{ {
local_info_t *lp = netdev_priv(dev); struct net_device *dev = data;
printk(KERN_NOTICE "%s: transmit timed out\n", dev->name);
lp->stats.tx_errors++;
/* reset the card */ /* reset the card */
do_reset(dev,1); do_reset(dev,1);
dev->trans_start = jiffies; dev->trans_start = jiffies;
netif_wake_queue(dev); netif_wake_queue(dev);
} }
static void
do_tx_timeout(struct net_device *dev)
{
local_info_t *lp = netdev_priv(dev);
lp->stats.tx_errors++;
printk(KERN_NOTICE "%s: transmit timed out\n", dev->name);
schedule_work(&lp->tx_timeout_task);
}
static int static int
do_start_xmit(struct sk_buff *skb, struct net_device *dev) do_start_xmit(struct sk_buff *skb, struct net_device *dev)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment