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])