xfrm6: remove unneeded NULL check in __xfrm6_output()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 31 Jan 2012 21:45:26 +0000 (21:45 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Feb 2012 07:52:48 +0000 (02:52 -0500)
commit5b11b2e4bdef20e839d90dce96c5bbeafaf9616c
tree8dfac0cc9ff403c906993a3d0d493575a50aa297
parenta8afca032998850ec63e83d555cdcf0eb5680cd6
xfrm6: remove unneeded NULL check in __xfrm6_output()

We don't check for NULL consistently in __xfrm6_output().  If "x" were
NULL here it would lead to an OOPs later.  I asked Steffen Klassert
about this and he suggested that we remove the NULL check.

On 10/29/11, Steffen Klassert <steffen.klassert@secunet.com> wrote:
>> net/ipv6/xfrm6_output.c
>>    148
>>    149 if ((x && x->props.mode == XFRM_MODE_TUNNEL) &&
>>                           ^
>
> x can't be null here. It would be a bug if __xfrm6_output() is called
> without a xfrm_state attached to the skb. I think we can just remove
> this null check.

Cc: Steffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/xfrm6_output.c