From aadf4326b0276545018e1b8b76ff5e9d4e691022 Mon Sep 17 00:00:00 2001
From: Pavel Emelyanov <xemul@openvz.org>
Date: Sun, 21 Oct 2007 17:02:30 -0700
Subject: [PATCH] --- yaml --- r: 72104 b: refs/heads/master c:
 e3fa259bcbbca25c8e8275c8dcedcf484854465b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 7d56478a87f5..db3a59a06a5c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 668f895a85b0c3a62a690425145f13dabebebd7a
+refs/heads/master: e3fa259bcbbca25c8e8275c8dcedcf484854465b
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index ecb0edef0b39..fd4e12f24270 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -300,8 +300,9 @@ struct sk_buff {
 #endif
 
 	int			iif;
+#ifdef CONFIG_NETDEVICES_MULTIQUEUE
 	__u16			queue_mapping;
-
+#endif
 #ifdef CONFIG_NET_SCHED
 	__u16			tc_index;	/* traffic control index */
 #ifdef CONFIG_NET_CLS_ACT