Merge "net: xfrm: remove duplicate output_mark" (03dc27e0) · Commits · e / devices / android_kernel_fairphone_FP3

net/xfrm/xfrm_user.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -872,11 +872,6 @@ static int copy_to_user_state_extra(struct xfrm_state *x,
		&x->replay);
		if (ret)
		goto out;
		if (x->props.output_mark) {
		ret = nla_put_u32(skb, XFRMA_OUTPUT_MARK, x->props.output_mark);
		if (ret)
		goto out;
		}
		if (x->security)
		ret = copy_sec_ctx(x->security, skb);
		if (x->props.output_mark) {