From patchwork Sat Sep 22 02:10:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 11633 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 7A4FB24112 for ; Sat, 22 Sep 2012 02:11:13 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 16C57A182F1 for ; Sat, 22 Sep 2012 02:11:12 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id e10so6323469iej.11 for ; Fri, 21 Sep 2012 19:11:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-content-scanned:x-cbid:x-gm-message-state; bh=Xnf81haDph1SeorluiAh7LhdoEIgY/jSDopWj+lLOlo=; b=ShOnEIj4H9MZ4EpF+JpBift13BIpk1aKvqZzoUpb8WGmmWv79enCBnf72sbHCPL8Os Pf434U5pXqTeI1X1SCLtqhSI0PekIuRw9/tvICgWNDoPUUtdfnxdyPM1M00yXRqnkItx YLLwGGh1k7px7pZ5A3E8ZLw6mgrY7RZtv5Dw12kNIGZ3c2aJith+HC47vmGzvisKdmG3 5KcJTZmUw6tjMNPMm4kPXR6sAD+KMkCT5Ns+w7+PnRzyOhZjI/C+no1I3AqQK7wrvIBj jS/v8f5rAn28zlZgmcEY3+OIwj/aqYiylQ3omXo62J9DoZ5zfE8Hum8PsO40TcUadGL9 IeNQ== Received: by 10.50.217.229 with SMTP id pb5mr136875igc.28.1348279872868; Fri, 21 Sep 2012 19:11:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp157913igc; Fri, 21 Sep 2012 19:11:12 -0700 (PDT) Received: by 10.60.172.42 with SMTP id az10mr5201475oec.1.1348279872271; Fri, 21 Sep 2012 19:11:12 -0700 (PDT) Received: from e36.co.us.ibm.com (e36.co.us.ibm.com. [32.97.110.154]) by mx.google.com with ESMTPS id df4si9176872obc.86.2012.09.21.19.11.12 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 21 Sep 2012 19:11:12 -0700 (PDT) Received-SPF: neutral (google.com: 32.97.110.154 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=32.97.110.154; Authentication-Results: mx.google.com; spf=neutral (google.com: 32.97.110.154 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) smtp.mail=john.stultz@linaro.org Received: from /spool/local by e36.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 21 Sep 2012 20:11:11 -0600 Received: from d03dlp02.boulder.ibm.com (9.17.202.178) by e36.co.us.ibm.com (192.168.1.136) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 21 Sep 2012 20:11:09 -0600 Received: from d03relay02.boulder.ibm.com (d03relay02.boulder.ibm.com [9.17.195.227]) by d03dlp02.boulder.ibm.com (Postfix) with ESMTP id 3839E3E40040; Fri, 21 Sep 2012 20:11:07 -0600 (MDT) Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay02.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q8M2B8M8235458; Fri, 21 Sep 2012 20:11:08 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q8M2B85Q001913; Fri, 21 Sep 2012 20:11:08 -0600 Received: from kernel-pok.stglabs.ibm.com (kernel.stglabs.ibm.com [9.114.214.19]) by d03av04.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id q8M2B1PB001183; Fri, 21 Sep 2012 20:11:07 -0600 From: John Stultz To: LKML Cc: Ashish Sharma , netdev@vger.kernel.org, JP Abgrall , Peter P Waskiewicz Jr , John Stultz Subject: [PATCH 7/7][RFC] netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification. Date: Fri, 21 Sep 2012 22:10:53 -0400 Message-Id: <1348279853-44499-8-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1348279853-44499-1-git-send-email-john.stultz@linaro.org> References: <1348279853-44499-1-git-send-email-john.stultz@linaro.org> X-Content-Scanned: Fidelis XPS MAILER x-cbid: 12092202-7606-0000-0000-000003DF92E0 X-Gm-Message-State: ALoCoQkBJtTGXpM7OPy43XXN0gGtew1xrg6IgAyNLdQ3yKTCXaHanTXH7hxkti0aAgXaTm6Briyj From: Ashish Sharma Rename INTERFACE to LABEL in netlink notification. Cc: netdev@vger.kernel.org Cc: JP Abgrall Cc: Ashish Sharma Cc: Peter P Waskiewicz Jr Signed-off-by: Ashish Sharma Signed-off-by: John Stultz --- net/netfilter/xt_IDLETIMER.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/net/netfilter/xt_IDLETIMER.c b/net/netfilter/xt_IDLETIMER.c index df91e26..f4ba863 100644 --- a/net/netfilter/xt_IDLETIMER.c +++ b/net/netfilter/xt_IDLETIMER.c @@ -68,15 +68,15 @@ static DEFINE_MUTEX(list_mutex); static struct kobject *idletimer_tg_kobj; -static void notify_netlink_uevent(const char *iface, struct idletimer_tg *timer) +static void notify_netlink_uevent(const char *label, struct idletimer_tg *timer) { - char iface_msg[NLMSG_MAX_SIZE]; + char label_msg[NLMSG_MAX_SIZE]; char state_msg[NLMSG_MAX_SIZE]; - char *envp[] = { iface_msg, state_msg, NULL }; + char *envp[] = { label_msg, state_msg, NULL }; int res; - res = snprintf(iface_msg, NLMSG_MAX_SIZE, "INTERFACE=%s", - iface); + res = snprintf(label_msg, NLMSG_MAX_SIZE, "LABEL=%s", + label); if (NLMSG_MAX_SIZE <= res) { pr_err("message too long (%d)", res); return; @@ -87,7 +87,7 @@ static void notify_netlink_uevent(const char *iface, struct idletimer_tg *timer) pr_err("message too long (%d)", res); return; } - pr_debug("putting nlmsg: <%s> <%s>\n", iface_msg, state_msg); + pr_debug("putting nlmsg: <%s> <%s>\n", label_msg, state_msg); kobject_uevent_env(idletimer_tg_kobj, KOBJ_CHANGE, envp); return;