From 18dcf9288ad47d61bcd5cdf949837975cea0385f Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Mon, 19 Jul 2010 22:01:26 -0700
Subject: [PATCH] --- yaml --- r: 203649 b: refs/heads/master c:
 e7c38157c61649e66f853d7b9f109119b8361448 h: refs/heads/master i:   203647:
 de843dbee36a4dabd2bffe2551273dd55c2caec4 v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/ipv6.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index edc648cdfa38..0232f42e222d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ae482e01d60bd4e8fc181f78355047e52999ce8
+refs/heads/master: e7c38157c61649e66f853d7b9f109119b8361448
diff --git a/trunk/include/linux/ipv6.h b/trunk/include/linux/ipv6.h
index 940e21595351..ab9e9e89e407 100644
--- a/trunk/include/linux/ipv6.h
+++ b/trunk/include/linux/ipv6.h
@@ -246,7 +246,7 @@ struct inet6_skb_parm {
 	__u16			srcrt;
 	__u16			dst1;
 	__u16			lastopt;
-	__u32			nhoff;
+	__u16			nhoff;
 	__u16			flags;
 #if defined(CONFIG_IPV6_MIP6) || defined(CONFIG_IPV6_MIP6_MODULE)
 	__u16			dsthao;