xfrm_user: avoid a warning with some compiler
authorNicolas Dichtel <nicolas.dichtel@6wind.com>
Tue, 31 Aug 2010 05:54:00 +0000 (05:54 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 1 Sep 2010 21:29:35 +0000 (14:29 -0700)
Attached is a small patch to remove a warning ("warning: ISO C90 forbids
mixed declarations and code" with gcc 4.3.2).

Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/xfrm/xfrm_user.c

index b14ed4b1f27c3bd70f5837c2f032baf11a88e9a1..8bae6b22c8461c7a03fd15f86bd672a662b0b437 100644 (file)
@@ -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);