Re: [PATCH v2] trace: events: fix error directive in argument list

[Mukesh Ojha]

On 3/30/2019 11:48 PM, Hariprasad Kelam wrote:

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 (n->tbl->family == AF_INET6) {
to if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6)

Signed-off-by: Hariprasad Kelam <hariprasad.ke...@gmail.com>

Reviewed-by: Mukesh Ojha <mo...@codeaurora.org>

Cheers,
-Mukesh

---
Changes in V2:
                 -Divide patch to only address spare error
---
  include/trace/events/neigh.h | 8 ++------
  1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/trace/events/neigh.h b/include/trace/events/neigh.h
index 0bdb085..2ca0180 100644
--- a/include/trace/events/neigh.h
+++ b/include/trace/events/neigh.h
@@ -70,12 +70,10 @@ TRACE_EVENT(neigh_update,
                else
                        *p32 = 0;

-#if IS_ENABLED(CONFIG_IPV6)

-               if (n->tbl->family == AF_INET6) {
+               if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6) {
                        pin6 = (struct in6_addr *)__entry->primary_key6;
                        *pin6 = *(struct in6_addr *)n->primary_key;
                } else
-#endif
                {
                        ipv6_addr_set_v4mapped(*p32, pin6);
                }
@@ -147,12 +145,10 @@ DECLARE_EVENT_CLASS(neigh__update,
                else
                        *p32 = 0;

-#if IS_ENABLED(CONFIG_IPV6)

-               if (n->tbl->family == AF_INET6) {
+               if (IS_ENABLED(CONFIG_IPV6) && n->tbl->family == AF_INET6) {
                        pin6 = (struct in6_addr *)__entry->primary_key6;
                        *pin6 = *(struct in6_addr *)n->primary_key;
                } else
-#endif
                {
                        ipv6_addr_set_v4mapped(*p32, pin6);
                }