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>
This commit is contained in:
parent
c2ed957c3b
commit
73343392aa
|
@ -274,17 +274,6 @@ static const struct ethtool_ops uml_net_ethtool_ops = {
|
||||||
.get_ts_info = ethtool_op_get_ts_info,
|
.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)
|
void uml_net_setup_etheraddr(struct net_device *dev, char *str)
|
||||||
{
|
{
|
||||||
unsigned char *addr = dev->dev_addr;
|
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,
|
.add_address = transport->user->add_address,
|
||||||
.delete_address = transport->user->delete_address });
|
.delete_address = transport->user->delete_address });
|
||||||
|
|
||||||
timer_setup(&lp->tl, uml_net_user_timer_expire, 0);
|
|
||||||
spin_lock_init(&lp->lock);
|
spin_lock_init(&lp->lock);
|
||||||
memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
|
memcpy(lp->mac, dev->dev_addr, sizeof(lp->mac));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue