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

Commit 3174a944 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'sctp-rename-sctp-diag-file-and-add-file-comments-for-it' 



Xin Long says:

====================
sctp: rename sctp diag file and add file comments for it

This patchset is to remove the sctp_ prefix for sctp diag file,
and also to add the missing file comments for it.

v1->v2:
  split them into two patches as Marcelo suggested.
====================

Acked-by: default avatarNeil Horman <nhorman@tuxdriver.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6c677750 6f68dc99

net/sctp/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ sctp-y := sm_statetable.o sm_statefuns.o sm_sideeffect.o \ 
	  offload.o stream_sched.o stream_sched_prio.o \

	  stream_sched_rr.o stream_interleave.o



sctp_diag-y := diag.o



sctp-$(CONFIG_SCTP_DBG_OBJCNT) += objcnt.o

sctp-$(CONFIG_PROC_FS) += proc.o

sctp-$(CONFIG_SYSCTL) += sysctl.o

net/sctp/sctp_diag.c→net/sctp/diag.c

+31 −0
Original line number Diff line number Diff line 
/* SCTP kernel implementation

 * (C) Copyright Red Hat Inc. 2017

 *

 * This file is part of the SCTP kernel implementation

 *

 * These functions implement sctp diag support.

 *

 * This SCTP implementation is free software;

 * you can redistribute it and/or modify it under the terms of

 * the GNU General Public License as published by

 * the Free Software Foundation; either version 2, or (at your option)

 * any later version.

 *

 * This SCTP implementation is distributed in the hope that it

 * will be useful, but WITHOUT ANY WARRANTY; without even the implied

 *                 ************************

 * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

 * See the GNU General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with GNU CC; see the file COPYING.  If not, see

 * <http://www.gnu.org/licenses/>.

 *

 * Please send any bug reports or fixes you make to the

 * email addresched(es):

 *    lksctp developers <linux-sctp@vger.kernel.org>

 *

 * Written or modified by:

 *    Xin Long <lucien.xin@gmail.com>

 */



#include <linux/module.h>

#include <linux/inet_diag.h>

#include <linux/sock_diag.h>