Updating iif to the VLAN device helps keeping routing
namespaces defined in case packets from multiple VLANs
collapse on a single device again.

Signed-off-by: Thomas Graf <tgraf@suug.ch>

Index: net-2.6.git/net/8021q/vlan_dev.c
===================================================================
--- net-2.6.git.orig/net/8021q/vlan_dev.c
+++ net-2.6.git/net/8021q/vlan_dev.c
@@ -156,6 +156,8 @@ int vlan_skb_recv(struct sk_buff *skb, s
 		return -1;
 	}
 
+	/* Make packets look like they have been received on the VLAN device */
+	skb->iif = skb->dev->ifindex;
 	skb->dev->last_rx = jiffies;
 
 	/* Bump the rx counters for the VLAN device. */

--