From 9dbe0debdb626fad9e4c2e4df17bd95b86948ef1 Mon Sep 17 00:00:00 2001
From: Eric Dumazet <eric.dumazet@gmail.com>
Date: Tue, 2 Jun 2009 05:20:21 +0000
Subject: [PATCH] --- yaml --- r: 150612 b: refs/heads/master c:
 e5b9215ef9a274eb9fb65f6aa4602ad82d10a6cb h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0714e8f544d2..fbd4bd2ddb9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: adf30907d63893e4208dfe3f5c88ae12bc2f25d5
+refs/heads/master: e5b9215ef9a274eb9fb65f6aa4602ad82d10a6cb
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 9ef6eb20247b..7305da92be8f 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -322,9 +322,7 @@ struct sk_buff {
 	ktime_t			tstamp;
 	struct net_device	*dev;
 
-	union {
-		unsigned long		_skb_dst;
-	};
+	unsigned long		_skb_dst;
 #ifdef CONFIG_XFRM
 	struct	sec_path	*sp;
 #endif