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

Commit 88a944ee authored by David S. Miller's avatar David S. Miller
Browse files

Revert "ax25: Fix std timer socket destroy handling." 



This reverts commit 30902dc3.

It causes all kinds of problems, based upon a report by
Bernard (f6bvp) and analysis by Jarek Poplawski.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 05238204

net/ax25/ax25_std_timer.c

+5 −3
Original line number Diff line number Diff line
@@ -39,9 +39,11 @@ void ax25_std_heartbeat_expiry(ax25_cb *ax25) 


	switch (ax25->state) {

	case AX25_STATE_0:

		if (!sk ||

		    sock_flag(sk, SOCK_DESTROY) ||

		    sock_flag(sk, SOCK_DEAD)) {

		/* Magic here: If we listen() and a new link dies before it

		   is accepted() it isn't 'dead' so doesn't get removed. */

		if (!sk || sock_flag(sk, SOCK_DESTROY) ||

		    (sk->sk_state == TCP_LISTEN &&

		     sock_flag(sk, SOCK_DEAD))) {

			if (sk) {

				sock_hold(sk);

				ax25_destroy_socket(ax25);