Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c949cbbb authored by David Ahern's avatar David Ahern Committed by David S. Miller
Browse files

net/ipv4: Remove tracepoint in fib_validate_source 



Tracepoint does not add value and the call to fib_lookup follows
it which shows the same information and the fib lookup result.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30d444d3

include/trace/events/fib.h

+0 −35
Original line number Diff line number Diff line
@@ -87,41 +87,6 @@ TRACE_EVENT(fib_table_lookup, 
		  __entry->tos, __entry->scope, __entry->flags,

		  __get_str(name), __entry->gw, __entry->saddr, __entry->err)

);



TRACE_EVENT(fib_validate_source,



	TP_PROTO(const struct net_device *dev, const struct flowi4 *flp),



	TP_ARGS(dev, flp),



	TP_STRUCT__entry(

		__string(	name,	dev->name	)

		__field(	int,	oif		)

		__field(	int,	iif		)

		__field(	__u8,	tos		)

		__array(	__u8,	src,	4	)

		__array(	__u8,	dst,	4	)

	),



	TP_fast_assign(

		__be32 *p32;



		__assign_str(name, dev ? dev->name : "not set");

		__entry->oif = flp->flowi4_oif;

		__entry->iif = flp->flowi4_iif;

		__entry->tos = flp->flowi4_tos;



		p32 = (__be32 *) __entry->src;

		*p32 = flp->saddr;



		p32 = (__be32 *) __entry->dst;

		*p32 = flp->daddr;

	),



	TP_printk("dev %s oif %d iif %d tos %d src %pI4 dst %pI4",

		  __get_str(name), __entry->oif, __entry->iif, __entry->tos,

		  __entry->src, __entry->dst)

);

#endif /* _TRACE_FIB_H */



/* This part must be outside protection */

net/ipv4/fib_frontend.c

+0 −2
Original line number Diff line number Diff line
@@ -354,8 +354,6 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, 
		fl4.fl4_dport = 0;

	}



	trace_fib_validate_source(dev, &fl4);



	if (fib_lookup(net, &fl4, &res, 0))

		goto last_resort;

	if (res.type != RTN_UNICAST &&