WorkStruct: make allyesconfig

[safe/jmp/linux-2.6] / drivers / net / wireless / prism54 / islpci_eth.c

diff --git a/drivers/net/wireless/prism54/islpci_eth.c b/drivers/net/wireless/prism54/islpci_eth.c
index 33d64d2..103a378 100644 (file)
--- a/drivers/net/wireless/prism54/islpci_eth.c
+++ b/drivers/net/wireless/prism54/islpci_eth.c
@@ -177,7 +177,7 @@ islpci_eth_transmit(struct sk_buff *skb, struct net_device *ndev)
 #endif
 
                        newskb->dev = skb->dev;
-                       dev_kfree_skb(skb);
+                       dev_kfree_skb_irq(skb);
                        skb = newskb;
                }
        }
@@ -482,9 +482,9 @@ islpci_eth_receive(islpci_private *priv)
 }
 
 void
-islpci_do_reset_and_wake(void *data)
+islpci_do_reset_and_wake(struct work_struct *work)
 {
-       islpci_private *priv = (islpci_private *) data;
+       islpci_private *priv = container_of(work, islpci_private, reset_task);
        islpci_reset(priv, 1);
        netif_wake_queue(priv->ndev);
        priv->reset_task_pending = 0;