Browse Source

netrom: Kill spurious NULL'ing of sk->sk_socket.

In nr_release(), one code path calls sock_orphan() which
will NULL out sk->sk_socket already.

In the other case, handling states other than NR_STATE_{0,1,2,3},
seems to not be possible other than due to bugs.  Even for an
uninitialized nr->state value, that would be zero or NR_STATE_0.
It might be wise to stick a WARN_ON() here.

Signed-off-by: David S. Miller <davem@davemloft.net>
David S. Miller 17 years ago
parent
commit
48c5732f4a
1 changed files with 0 additions and 2 deletions
  1. 0 2
      net/netrom/af_netrom.c

+ 0 - 2
net/netrom/af_netrom.c

@@ -536,11 +536,9 @@ static int nr_release(struct socket *sock)
 		sk->sk_state_change(sk);
 		sk->sk_state_change(sk);
 		sock_orphan(sk);
 		sock_orphan(sk);
 		sock_set_flag(sk, SOCK_DESTROY);
 		sock_set_flag(sk, SOCK_DESTROY);
-		sk->sk_socket   = NULL;
 		break;
 		break;
 
 
 	default:
 	default:
-		sk->sk_socket = NULL;
 		break;
 		break;
 	}
 	}