From c17e3189146feeb51954c532f88e72a6469b8ca8 Mon Sep 17 00:00:00 2001
From: Vlad Dogaru <ddvlad@rosedu.org>
Date: Thu, 13 Jan 2011 23:38:31 +0000
Subject: [PATCH] --- yaml --- r: 236556 b: refs/heads/master c:
 e7ed828f10bd89a28f821ae7f20e691704d61923 h: refs/heads/master v: v3

---
 [refs]                     |  2 +-
 trunk/net/core/rtnetlink.c | 32 ++++++++++++++++++++++++++++----
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 97dbcae26a7b..8eba3c6fd2ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbda10fa97d72c7a1923be4426171aa90e8c6dab
+refs/heads/master: e7ed828f10bd89a28f821ae7f20e691704d61923
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index 09062b07bf7f..a0b2eeb3b610 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -1558,6 +1558,24 @@ struct net_device *rtnl_create_link(struct net *src_net, struct net *net,
 }
 EXPORT_SYMBOL(rtnl_create_link);
 
+static int rtnl_group_changelink(struct net *net, int group,
+		struct ifinfomsg *ifm,
+		struct nlattr **tb)
+{
+	struct net_device *dev;
+	int err;
+
+	for_each_netdev(net, dev) {
+		if (dev->group == group) {
+			err = do_setlink(dev, ifm, tb, NULL, 0);
+			if (err < 0)
+				return err;
+		}
+	}
+
+	return 0;
+}
+
 static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 {
 	struct net *net = sock_net(skb->sk);
@@ -1585,10 +1603,16 @@ static int rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, void *arg)
 	ifm = nlmsg_data(nlh);
 	if (ifm->ifi_index > 0)
 		dev = __dev_get_by_index(net, ifm->ifi_index);
-	else if (ifname[0])
-		dev = __dev_get_by_name(net, ifname);
-	else
-		dev = NULL;
+	else {
+		if (ifname[0])
+			dev = __dev_get_by_name(net, ifname);
+		else if (tb[IFLA_GROUP])
+			return rtnl_group_changelink(net,
+					nla_get_u32(tb[IFLA_GROUP]),
+					ifm, tb);
+		else
+			dev = NULL;
+	}
 
 	err = validate_linkmsg(dev, tb);
 	if (err < 0)