WorkStruct: make allyesconfig

Fix up for make allyesconfig.

Signed-Off-By: David Howells <dhowells@redhat.com>

2 files changed, 8 insertions, 4 deletions

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index f753c40c11d2..55bb2634c088 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -77,12 +77,16 @@ static int port_cost(struct net_device *dev)
  * Called from work queue to allow for calling functions that
  * might sleep (such as speed check), and to debounce.
  */
-static void port_carrier_check(void *arg)
+static void port_carrier_check(struct work_struct *work)
 {
-        struct net_device *dev = arg;
         struct net_bridge_port *p;
+        struct net_device *dev;
         struct net_bridge *br;
 
+        dev = container_of(work, struct net_bridge_port,
+                           carrier_check.work)->dev;
+        work_release(work);
+
         rtnl_lock();
         p = dev->br_port;
         if (!p)
@@ -276,7 +280,7 @@ static struct net_bridge_port *new_nbp(struct net_bridge *br,
         p->port_no = index;
         br_init_port(p);
         p->state = BR_STATE_DISABLED;
-        INIT_WORK(&p->carrier_check, port_carrier_check, dev);
+        INIT_DELAYED_WORK_NAR(&p->carrier_check, port_carrier_check);
         br_stp_port_timer_init(p);
 
         kobject_init(&p->kobj);
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 74258d86f256..3a534e94c7f3 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -82,7 +82,7 @@ struct net_bridge_port
         struct timer_list               hold_timer;
         struct timer_list               message_age_timer;
         struct kobject                  kobj;
-        struct work_struct              carrier_check;
+        struct delayed_work             carrier_check;
         struct rcu_head                 rcu;
 };