diff options
Diffstat (limited to 'drivers/net/spider_net.c')
| -rw-r--r-- | drivers/net/spider_net.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 13e0a43e423b..ebb6aa39f9c7 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
| @@ -1939,10 +1939,11 @@ spider_net_stop(struct net_device *netdev) | |||
| 1939 | * called as task when tx hangs, resets interface (if interface is up) | 1939 | * called as task when tx hangs, resets interface (if interface is up) |
| 1940 | */ | 1940 | */ |
| 1941 | static void | 1941 | static void |
| 1942 | spider_net_tx_timeout_task(void *data) | 1942 | spider_net_tx_timeout_task(struct work_struct *work) |
| 1943 | { | 1943 | { |
| 1944 | struct net_device *netdev = data; | 1944 | struct spider_net_card *card = |
| 1945 | struct spider_net_card *card = netdev_priv(netdev); | 1945 | container_of(work, struct spider_net_card, tx_timeout_task); |
| 1946 | struct net_device *netdev = card->netdev; | ||
| 1946 | 1947 | ||
| 1947 | if (!(netdev->flags & IFF_UP)) | 1948 | if (!(netdev->flags & IFF_UP)) |
| 1948 | goto out; | 1949 | goto out; |
| @@ -2116,7 +2117,7 @@ spider_net_alloc_card(void) | |||
| 2116 | card = netdev_priv(netdev); | 2117 | card = netdev_priv(netdev); |
| 2117 | card->netdev = netdev; | 2118 | card->netdev = netdev; |
| 2118 | card->msg_enable = SPIDER_NET_DEFAULT_MSG; | 2119 | card->msg_enable = SPIDER_NET_DEFAULT_MSG; |
| 2119 | INIT_WORK(&card->tx_timeout_task, spider_net_tx_timeout_task, netdev); | 2120 | INIT_WORK(&card->tx_timeout_task, spider_net_tx_timeout_task); |
| 2120 | init_waitqueue_head(&card->waitq); | 2121 | init_waitqueue_head(&card->waitq); |
| 2121 | atomic_set(&card->tx_timeout_task_counter, 0); | 2122 | atomic_set(&card->tx_timeout_task_counter, 0); |
| 2122 | 2123 | ||
