From 683732302947a35e35c8e7590b49ca1e37393ee4 Mon Sep 17 00:00:00 2001
From: Sridhar Samudrala <sri@us.ibm.com>
Date: Mon, 8 Jun 2009 00:27:28 -0700
Subject: [PATCH] --- yaml --- r: 150744 b: refs/heads/master c:
 6f536f403979d37021508c5804509a379d853788 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index df9678e9dbda..08ef9b52cd27 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2faef52b72958b8b1c08e927b9b0691c314cf6f4
+refs/heads/master: 6f536f403979d37021508c5804509a379d853788
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 8d82511aa1bc..d83ccb8c982b 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -571,7 +571,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
 
 		if (gso.hdr_len > len)
 			return -EINVAL;
-		offset += sizeof(pi);
+		offset += sizeof(gso);
 	}
 
 	if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {