Merge branch 'pktdiag'

Browse source

Nicolas Dichtel says:

====================
The goal of this patchset is to be able to get all infos exported via the
/proc/net/packet and also beeing able to get filter associated to af_packet
sockets.

As usual, the patch against iproute2 will be sent once the patches are included
and net-next merged. I can send it on demand.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

...

This commit is contained in:

David S. Miller 2013-04-29 13:22:07 -04:00

parent fdd5f43a1b e8d9612c18

commit 13ccf043ce

4 changed files with 63 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

include/linux/sock_diag.h

View file

5

include/uapi/linux/packet_diag.h

View file

33

net/core/sock_diag.c

View file

27

net/packet/diag.c

View file