From 8d8356424393cf7e61d43aa70b9d79735400388d Mon Sep 17 00:00:00 2001
From: stephen hemminger <shemminger@vyatta.com>
Date: Wed, 8 Jun 2011 14:33:07 +0000
Subject: [PATCH] --- yaml --- r: 255473 b: refs/heads/master c:
 a504b86e718a425ea4a34e2f95b5cf0545ddfd8d h: refs/heads/master i:   255471:
 e57fd8b972f6576f7c273ccf4a1ed070e5926f92 v: v3

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

diff --git a/[refs] b/[refs]
index d895b0eefc0c..aaa98d3dc8b1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7625eb2f2fff7bfae41d3119b472c20b48874895
+refs/heads/master: a504b86e718a425ea4a34e2f95b5cf0545ddfd8d
diff --git a/trunk/drivers/net/tun.c b/trunk/drivers/net/tun.c
index 8a27cbf19dd6..17db19420637 100644
--- a/trunk/drivers/net/tun.c
+++ b/trunk/drivers/net/tun.c
@@ -584,7 +584,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
 {
 	struct tun_pi pi = { 0, cpu_to_be16(ETH_P_IP) };
 	struct sk_buff *skb;
-	size_t len = count, align = 0;
+	size_t len = count, align = NET_SKB_PAD;
 	struct virtio_net_hdr gso = { 0 };
 	int offset = 0;
 
@@ -614,7 +614,7 @@ static __inline__ ssize_t tun_get_user(struct tun_struct *tun,
 	}
 
 	if ((tun->flags & TUN_TYPE_MASK) == TUN_TAP_DEV) {
-		align = NET_IP_ALIGN;
+		align += NET_IP_ALIGN;
 		if (unlikely(len < ETH_HLEN ||
 			     (gso.hdr_len && gso.hdr_len < ETH_HLEN)))
 			return -EINVAL;