From 7e21eca4213716cd30558265f2063a627d7cb7c5 Mon Sep 17 00:00:00 2001
From: Klaus Heinrich Kiwi <klausk@br.ibm.com>
Date: Wed, 23 Jan 2008 22:57:45 -0500
Subject: [PATCH] --- yaml --- r: 82039 b: refs/heads/master c:
 7759db82774802885f96c250b36c3dfe317e62ff h: refs/heads/master i:   82037:
 d1cd3af4b0c28e48b27329719cb51d26345eff25   82035:
 e404e103ee52f4ba88ad52ce82d3b397a15f7124   82031:
 059e66c7da535cfb6163b981e6a962a0fd9ea3f1 v: v3

---
 [refs]               |  2 +-
 trunk/net/core/dev.c | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 283c5a53f55a..de2bde1cf78d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 320f1b1ed28c601cc152053a2f428a126cb608bc
+refs/heads/master: 7759db82774802885f96c250b36c3dfe317e62ff
diff --git a/trunk/net/core/dev.c b/trunk/net/core/dev.c
index ba075a9dcecb..9549417250bb 100644
--- a/trunk/net/core/dev.c
+++ b/trunk/net/core/dev.c
@@ -2752,13 +2752,15 @@ static void __dev_set_promiscuity(struct net_device *dev, int inc)
 		printk(KERN_INFO "device %s %s promiscuous mode\n",
 		       dev->name, (dev->flags & IFF_PROMISC) ? "entered" :
 							       "left");
-		audit_log(current->audit_context, GFP_ATOMIC,
-			AUDIT_ANOM_PROMISCUOUS,
-			"dev=%s prom=%d old_prom=%d auid=%u ses=%u",
-			dev->name, (dev->flags & IFF_PROMISC),
-			(old_flags & IFF_PROMISC),
-			audit_get_loginuid(current),
-			audit_get_sessionid(current));
+		if (audit_enabled)
+			audit_log(current->audit_context, GFP_ATOMIC,
+				AUDIT_ANOM_PROMISCUOUS,
+				"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),
+				current->uid, current->gid,
+				audit_get_sessionid(current));
 
 		if (dev->change_rx_flags)
 			dev->change_rx_flags(dev, IFF_PROMISC);