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

Commit 908cd2da authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by David S. Miller
Browse files

net: use %pF for /proc/net/ptype 



Technically, patch changes format for modules, but I think nobody cares.

	-86dd          :ipv6:ipv6_rcv+0x0
	+86dd          ipv6_rcv+0x0/0x400 [ipv6]

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5635c10d

net/core/dev.c

+2 −30
Original line number Diff line number Diff line
@@ -108,7 +108,6 @@ 
#include <linux/init.h>

#include <linux/kmod.h>

#include <linux/module.h>

#include <linux/kallsyms.h>

#include <linux/netpoll.h>

#include <linux/rcupdate.h>

#include <linux/delay.h>
@@ -2801,31 +2800,6 @@ static void ptype_seq_stop(struct seq_file *seq, void *v) 
	rcu_read_unlock();

}



static void ptype_seq_decode(struct seq_file *seq, void *sym)

{

#ifdef CONFIG_KALLSYMS

	unsigned long offset = 0, symsize;

	const char *symname;

	char *modname;

	char namebuf[128];



	symname = kallsyms_lookup((unsigned long)sym, &symsize, &offset,

				  &modname, namebuf);



	if (symname) {

		char *delim = ":";



		if (!modname)

			modname = delim = "";

		seq_printf(seq, "%s%s%s%s+0x%lx", delim, modname, delim,

			   symname, offset);

		return;

	}

#endif



	seq_printf(seq, "[%p]", sym);

}



static int ptype_seq_show(struct seq_file *seq, void *v)

{

	struct packet_type *pt = v;
@@ -2838,10 +2812,8 @@ static int ptype_seq_show(struct seq_file *seq, void *v) 
		else

			seq_printf(seq, "%04x", ntohs(pt->type));



		seq_printf(seq, " %-8s ",

			   pt->dev ? pt->dev->name : "");

		ptype_seq_decode(seq,  pt->func);

		seq_putc(seq, '\n');

		seq_printf(seq, " %-8s %pF\n",

			   pt->dev ? pt->dev->name : "", pt->func);

	}



	return 0;