Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f61d4ef authored by Parthasarathy Bhuvaragan's avatar Parthasarathy Bhuvaragan Committed by David S. Miller
Browse files

tipc: remove incorrect check for subscription timeout value 



Until now, during subscription creation we set sub->timeout by
converting the timeout request value in milliseconds to jiffies.
This is followed by setting the timeout value in the timer if
sub->timeout != TIPC_WAIT_FOREVER.

For a subscription create request with a timeout value of
TIPC_WAIT_FOREVER, msecs_to_jiffies(TIPC_WAIT_FOREVER)
returns MAX_JIFFY_OFFSET (0xfffffffe). This is not equal to
TIPC_WAIT_FOREVER (0xffffffff).

In this commit, we remove this check.

Acked-by: default avatarYing Xue <ying.xue@windriver.com>
Reviewed-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Signed-off-by: default avatarParthasarathy Bhuvaragan <parthasarathy.bhuvaragan@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c6140a29

net/tipc/subscr.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -270,7 +270,6 @@ static int tipc_subscrp_create(struct net *net, struct tipc_subscr *s, 
	memcpy(&sub->evt.s, s, sizeof(*s));

	memcpy(&sub->evt.s, s, sizeof(*s));

	atomic_inc(&tn->subscription_count);

	atomic_inc(&tn->subscription_count);

	setup_timer(&sub->timer, tipc_subscrp_timeout, (unsigned long)sub);

	setup_timer(&sub->timer, tipc_subscrp_timeout, (unsigned long)sub);

	if (sub->timeout != TIPC_WAIT_FOREVER)

	sub->timeout += jiffies;

	sub->timeout += jiffies;

	if (!mod_timer(&sub->timer, sub->timeout))

	if (!mod_timer(&sub->timer, sub->timeout))

		tipc_subscrb_get(subscriber);

		tipc_subscrb_get(subscriber);