aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorNicolas Dichtel <nicolas.dichtel@6wind.com>2010-08-31 05:54:00 +0000
committerDavid S. Miller <davem@davemloft.net>2010-09-01 14:29:35 -0700
commit928497f0209027ccd649480a38a499fab9c3f6f6 (patch)
treec2d86ba0a40d43ea964e8900999c9e3c09076a91 /net
parent3b2eb6131e2f6ff646abb0fc69648179b8b70216 (diff)
downloadmrst-s0i3-test-928497f0209027ccd649480a38a499fab9c3f6f6.tar.gz
mrst-s0i3-test-928497f0209027ccd649480a38a499fab9c3f6f6.tar.xz
mrst-s0i3-test-928497f0209027ccd649480a38a499fab9c3f6f6.zip
xfrm_user: avoid a warning with some compiler
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>
Diffstat (limited to 'net')
-rw-r--r--net/xfrm/xfrm_user.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index b14ed4b1f27..8bae6b22c84 100644
--- a/net/xfrm/xfrm_user.c
+++ b/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);