[openib-general] Re: [PATCHv6] SDP: Allow SDP to compile on 2.6.12-rc6

[Michael S. Tsirkin]

Quoting r. Tom Duffy <tduffy at sun.com>:
> Subject: [PATCHv6] SDP: Allow SDP to compile on 2.6.12-rc6
> 
> This updates the 2.6.12 SDP patch against the state change patch Libor
> checked into r2577.
>
> ...
>
> Index: linux-2.6.12-rc6-openib/drivers/infiniband/ulp/sdp/sdp_inet.c
> ===================================================================
> --- linux-2.6.12-rc6-openib/drivers/infiniband/ulp/sdp/sdp_inet.c	(revision 2577)
> +++ linux-2.6.12-rc6-openib/drivers/infiniband/ulp/sdp/sdp_inet.c	(working copy)
> @@ -129,9 +129,9 @@ MODULE_PARM_DESC(sdp_debug_level,
>   */
>  void sdp_inet_wake_send(struct sock *sk)
>  {
> -	struct sdp_opt *conn;
> +	struct sdp_opt *conn = sdp_sk(sk);
>  
> -	if (!sk || !(conn = SDP_GET_CONN(sk)))
> +	if (!sk)
>  		return;
>  
>  	if (sk->sk_socket && test_bit(SOCK_NOSPACE, &sk->sk_socket->flags) &&

I didnt look at this in depth, but is it safe to call sdp_sk(sk) if sk may
be NULL as the above seems to do?


-- 
MST