summaryrefslogtreecommitdiffstats
path: root/arch/um/drivers
diff options
context:
space:
mode:
authorLeon Romanovsky <leonro@mellanox.com>2020-02-20 10:40:14 +0200
committerRichard Weinberger <richard@nod.at>2020-03-29 23:21:26 +0200
commit73343392aae8bdd939ca58e855889d1b015b0ef4 (patch)
treedcfaeb1f11740944090986a6a63e6b88e5d4bf18 /arch/um/drivers
parentc2ed957c3b288cd037d2c933222edaf1e20ede26 (diff)
downloadlinux-stable-73343392aae8bdd939ca58e855889d1b015b0ef4.tar.gz
linux-stable-73343392aae8bdd939ca58e855889d1b015b0ef4.tar.bz2
linux-stable-73343392aae8bdd939ca58e855889d1b015b0ef4.zip
um: Delete never executed timer
The "#ifdef undef" construction effectively disabled the timer. It causes to the fact that this timer did nothing, so delete it. Signed-off-by: Leon Romanovsky <leonro@mellanox.com> Acked-by: Anton Ivanov <anton.ivanov@cambridgegreys.com> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/drivers')
-rw-r--r--arch/um/drivers/net_kern.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/um/drivers/net_kern.c b/arch/um/drivers/net_kern.c
index af07733c2dc8..1802cf4ef5a5 100644
--- a/arch/um/drivers/net_kern.c
+++ b/arch/um/drivers/net_kern.c
@@ -274,17 +274,6 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
.get_ts_info = ethtool_op_get_ts_info,
};
-static void uml_net_user_timer_expire(struct timer_list *t)
-{
-#ifdef undef
- 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);
-#endif
-}
-
void uml_net_setup_etheraddr(struct net_device *dev, char *str)
{
unsigned char *addr = dev->dev_addr;
@@ -455,7 +444,6 @@ static void eth_configure(int n, void *init, char *mac,
.add_address = transport->user->add_address,
.delete_address = transport->user->delete_address });
- timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
spin_lock_init(&lp->lock);
memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));