From 51b9e04bad302c296fcafbd52c283d71ca9c0f48 Mon Sep 17 00:00:00 2001
From: Doug Goldstein <cardoe@cardoe.com>
Date: Mon, 18 Feb 2013 14:59:23 +0000
Subject: [PATCH] --- yaml --- r: 352791 b: refs/heads/master c:
 b3f92b63c4c793142751d029ae0037fb8ab403a0 h: refs/heads/master i:   352789:
 a01e6cbe964f323f51180dcbc303bb2abd7d814b   352787:
 111bc72b6ee3ce5be53d269b2f6057960b0079c5   352783:
 ea814349c9d0f0f8b3ca8804e6aec69e7df82b36 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/net/bonding/bond_main.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ff8fc449a289..10ff1b883095 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0896341a44bf04bf6149d9307fe4686006f3eee1
+refs/heads/master: b3f92b63c4c793142751d029ae0037fb8ab403a0
diff --git a/trunk/drivers/net/bonding/bond_main.c b/trunk/drivers/net/bonding/bond_main.c
index e242dd12e5a3..11d01d67b3f5 100644
--- a/trunk/drivers/net/bonding/bond_main.c
+++ b/trunk/drivers/net/bonding/bond_main.c
@@ -4264,6 +4264,10 @@ static const struct net_device_ops bond_netdev_ops = {
 	.ndo_fix_features	= bond_fix_features,
 };
 
+static const struct device_type bond_type = {
+	.name = "bond",
+};
+
 static void bond_destructor(struct net_device *bond_dev)
 {
 	struct bonding *bond = netdev_priv(bond_dev);
@@ -4294,6 +4298,8 @@ static void bond_setup(struct net_device *bond_dev)
 
 	bond_dev->destructor = bond_destructor;
 
+	SET_NETDEV_DEVTYPE(bond_dev, &bond_type);
+
 	/* Initialize the device options */
 	bond_dev->tx_queue_len = 0;
 	bond_dev->flags |= IFF_MASTER|IFF_MULTICAST;