From ec5a39c2014cec66deca6b9927dd5361bc4798b1 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Sun, 21 Oct 2012 19:53:57 +0000
Subject: [PATCH] --- yaml --- r: 340710 b: refs/heads/master c:
 e949b09b71d975a82f13ac88ce4ad338fed213da h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/net/8021q/vlan_dev.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f8686e210b3d..9b183fbacd7b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23612632435892fe66268f9598d5550ccdfdeea8
+refs/heads/master: e949b09b71d975a82f13ac88ce4ad338fed213da
diff --git a/trunk/net/8021q/vlan_dev.c b/trunk/net/8021q/vlan_dev.c
index 6da96d433175..4a6d31a082b9 100644
--- a/trunk/net/8021q/vlan_dev.c
+++ b/trunk/net/8021q/vlan_dev.c
@@ -531,6 +531,10 @@ static const struct header_ops vlan_header_ops = {
 	.parse	 = eth_header_parse,
 };
 
+static struct device_type vlan_type = {
+	.name	= "vlan",
+};
+
 static const struct net_device_ops vlan_netdev_ops;
 
 static int vlan_dev_init(struct net_device *dev)
@@ -579,6 +583,8 @@ static int vlan_dev_init(struct net_device *dev)
 
 	dev->netdev_ops = &vlan_netdev_ops;
 
+	SET_NETDEV_DEVTYPE(dev, &vlan_type);
+
 	if (is_vlan_dev(real_dev))
 		subclass = 1;