From d3005329cd1d37f586ac17999815e081ff26bee5 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Thu, 3 Feb 2011 17:21:31 -0800
Subject: [PATCH] --- yaml --- r: 232891 b: refs/heads/master c:
 0033d5ad27a6db33a55ff39951d3ec61a8c13b89 h: refs/heads/master i:   232889:
 b4ed313f3110526ce6741b6ddacd4e87ea08d508   232887:
 a9491aea6b975358c235f54c29f5bed7f6e82df0 v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv4/ipmr.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 950c8469b7fa..323a074bb07c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9690c636ac118b6662f28308bee817343d9932d8
+refs/heads/master: 0033d5ad27a6db33a55ff39951d3ec61a8c13b89
diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c
index 7e41ac0b9260..fce10a080bd6 100644
--- a/trunk/net/ipv4/ipmr.c
+++ b/trunk/net/ipv4/ipmr.c
@@ -1446,7 +1446,7 @@ struct compat_sioc_sg_req {
 
 int ipmr_compat_ioctl(struct sock *sk, unsigned int cmd, void __user *arg)
 {
-	struct sioc_sg_req sr;
+	struct compat_sioc_sg_req sr;
 	struct mfc_cache *c;
 	struct net *net = sock_net(sk);
 	struct mr_table *mrt;