From 52259385b4e01ac5749985835079edd6765be144 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Sun, 16 Nov 2008 23:20:31 -0800
Subject: [PATCH] --- yaml --- r: 119099 b: refs/heads/master c:
 5f9021cfdc3524a4c5e3d7ae2d049eb7adcd6776 h: refs/heads/master i:   119097:
 9772310df1aafd76e38d0e5992111e79974e8bdc   119095:
 eaa96b354e6c5e064c5a958726d23c62cf21d11c v: v3

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

diff --git a/[refs] b/[refs]
index 4dc5323e6e52..5f441a601ecf 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 584c650b4e6fa16f9ab45d382f86ad6d9c625227
+refs/heads/master: 5f9021cfdc3524a4c5e3d7ae2d049eb7adcd6776
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index 31f29d2989fd..4dfb6b4d4559 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -878,7 +878,9 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
 		if (ifm->ifi_change)
 			flags = (flags & ifm->ifi_change) |
 				(dev->flags & ~ifm->ifi_change);
-		dev_change_flags(dev, flags);
+		err = dev_change_flags(dev, flags);
+		if (err < 0)
+			goto errout;
 	}
 
 	if (tb[IFLA_TXQLEN])