Merge branch 'sctp_diag-fixes'

Browse source

Phil Sutter says:

====================
sctp_diag: A bunch of fixes for upcoming 'ss' support

The following series contains a number of fixes necessary to make my yet
unpublished 'ss' support patch functional.

Changes since v1:
- Fixed patch 2/3
- Rebased whole series onto current net-next/master

Changes since v2:
- Improved description of patch 2/3
====================

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

...

This commit is contained in:

David S. Miller 2016-08-08 12:51:59 -07:00

parent c518189567 1ba8d77f41

commit 05ec40f06a

3 changed files with 76 additions and 70 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

64

include/linux/sctp.h

View file

64

include/uapi/linux/sctp.h

View file

18

net/sctp/sctp_diag.c

View file