From 00c098005d4fda3b98be4614fc88ff731a8e6df2 Mon Sep 17 00:00:00 2001 From: Nicolas Dichtel Date: Tue, 31 Aug 2010 05:54:00 +0000 Subject: [PATCH] --- yaml --- r: 210265 b: refs/heads/master c: 928497f0209027ccd649480a38a499fab9c3f6f6 h: refs/heads/master i: 210263: bcc315270e28e619c98a6c2313b63be286d0f5d6 v: v3 --- [refs] | 2 +- trunk/net/xfrm/xfrm_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cb92c4e6ac58..e096706da222 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b2eb6131e2f6ff646abb0fc69648179b8b70216 +refs/heads/master: 928497f0209027ccd649480a38a499fab9c3f6f6 diff --git a/trunk/net/xfrm/xfrm_user.c b/trunk/net/xfrm/xfrm_user.c index b14ed4b1f27c..8bae6b22c846 100644 --- a/trunk/net/xfrm/xfrm_user.c +++ b/trunk/net/xfrm/xfrm_user.c @@ -1801,7 +1801,7 @@ static int xfrm_add_sa_expire(struct sk_buff *skb, struct nlmsghdr *nlh, struct xfrm_user_expire *ue = nlmsg_data(nlh); struct xfrm_usersa_info *p = &ue->state; struct xfrm_mark m; - u32 mark = xfrm_mark_get(attrs, &m);; + u32 mark = xfrm_mark_get(attrs, &m); x = xfrm_state_lookup(net, mark, &p->id.daddr, p->id.spi, p->id.proto, p->family);