exofs: drop lock/unlock super

[firefly-linux-kernel-4.4.55.git] / net / core / dev.c

diff --git a/net/core/dev.c b/net/core/dev.c
index ba4bb118a756e772924a785a00d3325430685e80..1e0a1847c3bbee7fd5aeb8654bf0d9da08ce5ca9 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -4569,7 +4569,7 @@ static int __dev_set_promiscuity(struct net_device *dev, int inc)
                                "dev=%s prom=%d old_prom=%d auid=%u uid=%u gid=%u ses=%u",
                                dev->name, (dev->flags & IFF_PROMISC),
                                (old_flags & IFF_PROMISC),
-                               audit_get_loginuid(current),
+                               from_kuid(&init_user_ns, audit_get_loginuid(current)),
                                from_kuid(&init_user_ns, uid),
                                from_kgid(&init_user_ns, gid),
                                audit_get_sessionid(current));
@@ -6464,22 +6464,26 @@ const char *netdev_drivername(const struct net_device *dev)
        return empty;
 }
 
-int __netdev_printk(const char *level, const struct net_device *dev,
+static int __netdev_printk(const char *level, const struct net_device *dev,
                           struct va_format *vaf)
 {
        int r;
 
-       if (dev && dev->dev.parent)
-               r = dev_printk(level, dev->dev.parent, "%s: %pV",
-                              netdev_name(dev), vaf);
-       else if (dev)
+       if (dev && dev->dev.parent) {
+               r = dev_printk_emit(level[1] - '0',
+                                   dev->dev.parent,
+                                   "%s %s %s: %pV",
+                                   dev_driver_string(dev->dev.parent),
+                                   dev_name(dev->dev.parent),
+                                   netdev_name(dev), vaf);
+       } else if (dev) {
                r = printk("%s%s: %pV", level, netdev_name(dev), vaf);
-       else
+       } else {
                r = printk("%s(NULL net_device): %pV", level, vaf);
+       }
 
        return r;
 }
-EXPORT_SYMBOL(__netdev_printk);
 
 int netdev_printk(const char *level, const struct net_device *dev,
                  const char *format, ...)
@@ -6494,6 +6498,7 @@ int netdev_printk(const char *level, const struct net_device *dev,
        vaf.va = &args;
 
        r = __netdev_printk(level, dev, &vaf);
+
        va_end(args);
 
        return r;
@@ -6513,6 +6518,7 @@ int func(const struct net_device *dev, const char *fmt, ...)      \
        vaf.va = &args;                                         \
                                                                \
        r = __netdev_printk(level, dev, &vaf);                  \
+                                                               \
        va_end(args);                                           \
                                                                \
        return r;                                               \