Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / net / core / link_watch.c

diff --git a/net/core/link_watch.c b/net/core/link_watch.c
index f2ed09e25dfd63fdba8d1d9f8e9e16550dfab239..e3c26a9ccad6e097b098bc0783d9076c589199d9 100644 (file)
--- 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_DELAYED_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);
@@ -79,7 +79,7 @@ static void rfc2863_policy(struct net_device *dev)
        case IF_LINK_MODE_DEFAULT:
        default:
                break;
-       };
+       }
 
        dev->operstate = operstate;
 
@@ -124,16 +124,16 @@ void linkwatch_run_queue(void)
 
                dev_put(dev);
        }
-}       
+}
 
 
-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
         * cause a storm of messages on the netlink
         * socket
-        */     
+        */
        linkwatch_nextevent = jiffies + HZ;
        clear_bit(LW_RUNNING, &linkwatch_flags);