diff --git a/[refs] b/[refs]
index 34e8f68f064b..c995151bc9f7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eb1669aed950cb5f34622bcceba66bef5980e97a
+refs/heads/master: 253683bbfb6bc5864417c8c35cb6ef13b5e259e6
diff --git a/trunk/net/core/rtnetlink.c b/trunk/net/core/rtnetlink.c
index e4b9870e4706..7ab86f3a1ea4 100644
--- a/trunk/net/core/rtnetlink.c
+++ b/trunk/net/core/rtnetlink.c
@@ -1199,8 +1199,10 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
 		struct nlattr *attr;
 		int rem;
 		nla_for_each_nested(attr, tb[IFLA_VFINFO_LIST], rem) {
-			if (nla_type(attr) != IFLA_VF_INFO)
+			if (nla_type(attr) != IFLA_VF_INFO) {
+				err = -EINVAL;
 				goto errout;
+			}
 			err = do_setvfinfo(dev, attr);
 			if (err < 0)
 				goto errout;