From f6b2f19becaf45b0ec1bce84f9b37d49aa5f621d Mon Sep 17 00:00:00 2001
From: Mark J Cox <mjc@redhat.com>
Date: Mon, 19 Sep 2005 17:55:30 -0700
Subject: [PATCH] --- yaml --- r: 9077 b: refs/heads/master c:
 6d1cfe3f1752f17e297df60c8bcc6cd6e0a58449 h: refs/heads/master i:   9075:
 bfb321edb6df691614b5a5f651532715ca8e125d v: v3

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

diff --git a/[refs] b/[refs]
index f1add3f9b129..bc2147639a11 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 997a51ae373df6484cdd4a5fc61a9c9bec82cd68
+refs/heads/master: 6d1cfe3f1752f17e297df60c8bcc6cd6e0a58449
diff --git a/trunk/net/ipv4/raw.c b/trunk/net/ipv4/raw.c
index 304bb0a1d4f0..4b0d7e4d6269 100644
--- a/trunk/net/ipv4/raw.c
+++ b/trunk/net/ipv4/raw.c
@@ -361,7 +361,7 @@ static void raw_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
 
 			if (type && code) {
 				get_user(fl->fl_icmp_type, type);
-				__get_user(fl->fl_icmp_code, code);
+			        get_user(fl->fl_icmp_code, code);
 				probed = 1;
 			}
 			break;
diff --git a/trunk/net/ipv6/raw.c b/trunk/net/ipv6/raw.c
index 5aa3691c578d..a1265a320b11 100644
--- a/trunk/net/ipv6/raw.c
+++ b/trunk/net/ipv6/raw.c
@@ -627,7 +627,7 @@ static void rawv6_probe_proto_opt(struct flowi *fl, struct msghdr *msg)
 
 			if (type && code) {
 				get_user(fl->fl_icmp_type, type);
-				__get_user(fl->fl_icmp_code, code);
+				get_user(fl->fl_icmp_code, code);
 				probed = 1;
 			}
 			break;