um: net: Convert timers to use timer_setup()

In preparation for unconditionally passing the struct timer_list pointer to
all timer callbacks, switch to using the new timer_setup() and from_timer()
to pass the timer pointer explicitly. (Note that this timer is actually
disabled.)

Cc: Jeff Dike <jdike@addtoit.com>
Cc: Richard Weinberger <richard@nod.at>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jarod Wilson <jarod@redhat.com>
Cc: user-mode-linux-devel@lists.sourceforge.net
Cc: user-mode-linux-user@lists.sourceforge.net
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index 1669240..b305f82 100644 (file)
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -168,7 +168,6 @@ static int uml_net_open(struct net_device *dev)
                goto out_close;
        }
 
-       lp->tl.data = (unsigned long) &lp->user;
        netif_start_queue(dev);
 
        /* clear buffer - it can happen that the host side of the interface
@@ -278,10 +277,11 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
        .get_ts_info    = ethtool_op_get_ts_info,
 };
 
-static void uml_net_user_timer_expire(unsigned long _conn)
+static void uml_net_user_timer_expire(struct timer_list *t)
 {
 #ifdef undef
-       struct connection *conn = (struct connection *)_conn;
+       struct uml_net_private *lp = from_timer(lp, t, tl);
+       struct connection *conn = &lp->user;
 
        dprintk(KERN_INFO "uml_net_user_timer_expire [%p]\n", conn);
        do_connect(conn);
@@ -458,9 +458,8 @@ static void eth_configure(int n, void *init, char *mac,
                  .add_address          = transport->user->add_address,
                  .delete_address       = transport->user->delete_address });
 
-       init_timer(&lp->tl);
+       timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
        spin_lock_init(&lp->lock);
-       lp->tl.function = uml_net_user_timer_expire;
        memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
 
        if ((transport->user->init != NULL) &&