2 files changed, 11 insertions, 13 deletions

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index 4b36114744..549a2ce951 100644
--- a/net/core/link_watch.c
+++ b/net/core/link_watch.c
@@ -34,8 +34,8 @@ enum lw_bits {
 static unsigned long linkwatch_flags;
 static unsigned long linkwatch_nextevent;
 
-static void linkwatch_event(void *dummy);
-static DECLARE_WORK(linkwatch_work, linkwatch_event, NULL);
+static void linkwatch_event(struct work_struct *dummy);
+static DECLARE_DELAYED_WORK(linkwatch_work, linkwatch_event);
 
 static LIST_HEAD(lweventlist);
 static DEFINE_SPINLOCK(lweventlist_lock);
@@ -127,7 +127,7 @@ void linkwatch_run_queue(void)
 }       
 
 
-static void linkwatch_event(void *dummy)
+static void linkwatch_event(struct work_struct *dummy)
 {
         /* Limit the number of linkwatch events to one
          * per second so that a runaway driver does not
@@ -171,10 +171,9 @@ void linkwatch_fire_event(struct net_device *dev)
                         unsigned long delay = linkwatch_nextevent - jiffies;
 
                         /* If we wrap around we'll delay it by at most HZ. */
-                        if (!delay || delay > HZ)
-                                schedule_work(&linkwatch_work);
-                        else
-                                schedule_delayed_work(&linkwatch_work, delay);
+                        if (delay > HZ)
+                                delay = 0;
+                        schedule_delayed_work(&linkwatch_work, delay);
                 }
         }
 }
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 3c58846fca..b3c559b9ac 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -50,9 +50,10 @@ static atomic_t trapped;
 static void zap_completion_queue(void);
 static void arp_reply(struct sk_buff *skb);
 
-static void queue_process(void *p)
+static void queue_process(struct work_struct *work)
 {
-        struct netpoll_info *npinfo = p;
+        struct netpoll_info *npinfo =
+                container_of(work, struct netpoll_info, tx_work.work);
         struct sk_buff *skb;
 
         while ((skb = skb_dequeue(&npinfo->txq))) {
@@ -72,8 +73,6 @@ static void queue_process(void *p)
                         schedule_delayed_work(&npinfo->tx_work, HZ/10);
                         return;
                 }
-
-                netif_tx_unlock_bh(dev);
         }
 }
 
@@ -263,7 +262,7 @@ static void netpoll_send_skb(struct netpoll *np, struct sk_buff *skb)
 
         if (status != NETDEV_TX_OK) {
                 skb_queue_tail(&npinfo->txq, skb);
-                schedule_work(&npinfo->tx_work);
+                schedule_delayed_work(&npinfo->tx_work,0);
         }
 }
 
@@ -628,7 +627,7 @@ int netpoll_setup(struct netpoll *np)
                 spin_lock_init(&npinfo->rx_lock);
                 skb_queue_head_init(&npinfo->arp_tx);
                 skb_queue_head_init(&npinfo->txq);
-                INIT_WORK(&npinfo->tx_work, queue_process, npinfo);
+                INIT_DELAYED_WORK(&npinfo->tx_work, queue_process);
 
                 atomic_set(&npinfo->refcnt, 1);
         } else {