Merge tag 'for-3.5' of git://openrisc.net/jonas/linux

[karo-tx-linux.git] / net / core / rtnetlink.c

diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c
index b442d35bbc8bbc1e96e008c77ef65a747e4e5eae..21318d15bbc3c1578bd2650282de9b6ddde7ae23 100644 (file)
--- a/net/core/rtnetlink.c
+++ b/net/core/rtnetlink.c
@@ -1524,11 +1524,9 @@ static int do_setlink(struct net_device *dev, struct ifinfomsg *ifm,
        err = 0;
 
 errout:
-       if (err < 0 && modified && net_ratelimit())
-               printk(KERN_WARNING "A link change request failed with "
-                      "some changes committed already. Interface %s may "
-                      "have been left with an inconsistent configuration, "
-                      "please check.\n", dev->name);
+       if (err < 0 && modified)
+               net_warn_ratelimited("A link change request failed with some changes committed already. Interface %s may have been left with an inconsistent configuration, please check.\n",
+                                    dev->name);
 
        if (send_addr_notify)
                call_netdevice_notifiers(NETDEV_CHANGEADDR, dev);