Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 26 Mar 2019 01:23:03 +0530
From:   Hariprasad Kelam <hariprasad.kelam@gmail.com>
To:     rostedt@goodmis.org, mingo@redhat.com, roopa@cumulusnetworks.com,
        davem@davemloft.net, linux-kernel@vger.kernel.org
Subject: [PATCH] trace: events: fix  error directive in argument list
Message-ID: <20190325195303.GA20629@hari-Inspiron-1545>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.24 (2015-08-30)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

This patch fixes below spare errors.

Sparse error:
make C=2 CF=-D__CHECK_ENDIAN__ M=net/core
./include/trace/events/neigh.h:73:1: error: directive in argument list
./include/trace/events/neigh.h:78:1: error: directive in argument list
./include/trace/events/neigh.h:150:1: error: directive in argument list
./include/trace/events/neigh.h:155:1: error: directive in argument list

Changes below two lines to signle line to avoid sparse error
 #if IS_ENABLED(CONFIG_IPV6)
               if (n->tbl->family == AF_INET6) {
to if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6)

and removes reassigning pin6 pointer when IPV6 is enabled

Signed-off-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
---
 include/trace/events/neigh.h | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/include/trace/events/neigh.h b/include/trace/events/neigh.h
index 0bdb085..6e310ea 100644
--- a/include/trace/events/neigh.h
+++ b/include/trace/events/neigh.h
@@ -70,15 +70,11 @@ TRACE_EVENT(neigh_update,
 		else
 			*p32 = 0;
 
-#if IS_ENABLED(CONFIG_IPV6)
-		if (n->tbl->family == AF_INET6) {
-			pin6 = (struct in6_addr *)__entry->primary_key6;
+		if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6)
 			*pin6 = *(struct in6_addr *)n->primary_key;
-		} else
-#endif
-		{
+		else
 			ipv6_addr_set_v4mapped(*p32, pin6);
-		}
+
 		__entry->confirmed = n->confirmed;
 		__entry->updated = n->updated;
 		__entry->used = n->used;
@@ -147,15 +143,10 @@ DECLARE_EVENT_CLASS(neigh__update,
 		else
 			*p32 = 0;
 
-#if IS_ENABLED(CONFIG_IPV6)
-		if (n->tbl->family == AF_INET6) {
-			pin6 = (struct in6_addr *)__entry->primary_key6;
+		if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6)
 			*pin6 = *(struct in6_addr *)n->primary_key;
-		} else
-#endif
-		{
+		else
 			ipv6_addr_set_v4mapped(*p32, pin6);
-		}
 
 		__entry->confirmed = n->confirmed;
 		__entry->updated = n->updated;
-- 
2.7.4