diff --git a/[refs] b/[refs] index 7b810f72d92b..4d2290f1ca11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cbafe312ef4a263e9aa36786bc67e1e6d959872b +refs/heads/master: 920da6923cf03c8a78fbaffa408f8ab37f6abfc1 diff --git a/trunk/net/key/af_key.c b/trunk/net/key/af_key.c index e55e0441e4d9..3440a4637f01 100644 --- a/trunk/net/key/af_key.c +++ b/trunk/net/key/af_key.c @@ -2075,7 +2075,6 @@ static int pfkey_xfrm_policy2msg(struct sk_buff *skb, struct xfrm_policy *xp, in req_size += socklen * 2; } else { size -= 2*socklen; - socklen = 0; } rq = (void*)skb_put(skb, req_size); pol->sadb_x_policy_len += req_size/8;