Commit b01a2407 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

sctp: Make the mib per network namespace 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarVlad Yasevich <vyasevich@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent bb2db45b

include/net/netns/sctp.h

+3 −0
Original line number Diff line number Diff line
@@ -3,8 +3,11 @@ 


struct sock;

struct proc_dir_entry;

struct sctp_mib;



struct netns_sctp {

	DEFINE_SNMP_STAT(struct sctp_mib, sctp_statistics);



#ifdef CONFIG_PROC_FS

	struct proc_dir_entry *proc_net_sctp;

#endif

include/net/sctp/sctp.h

+4 −5
Original line number Diff line number Diff line
@@ -221,11 +221,10 @@ extern struct kmem_cache *sctp_bucket_cachep __read_mostly; 
#define sctp_bh_unlock_sock(sk)  bh_unlock_sock(sk)



/* SCTP SNMP MIB stats handlers */

DECLARE_SNMP_STAT(struct sctp_mib, sctp_statistics);

#define SCTP_INC_STATS(field)      SNMP_INC_STATS(sctp_statistics, field)

#define SCTP_INC_STATS_BH(field)   SNMP_INC_STATS_BH(sctp_statistics, field)

#define SCTP_INC_STATS_USER(field) SNMP_INC_STATS_USER(sctp_statistics, field)

#define SCTP_DEC_STATS(field)      SNMP_DEC_STATS(sctp_statistics, field)

#define SCTP_INC_STATS(net, field)      SNMP_INC_STATS((net)->sctp.sctp_statistics, field)

#define SCTP_INC_STATS_BH(net, field)   SNMP_INC_STATS_BH((net)->sctp.sctp_statistics, field)

#define SCTP_INC_STATS_USER(net, field) SNMP_INC_STATS_USER((net)->sctp.sctp_statistics, field)

#define SCTP_DEC_STATS(net, field)      SNMP_DEC_STATS((net)->sctp.sctp_statistics, field)



#endif /* !TEST_FRAME */

net/sctp/associola.c

+1 −1
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
		if (sctp_chunk_is_data(chunk))

			asoc->peer.last_data_from = chunk->transport;

		else

			SCTP_INC_STATS(SCTP_MIB_INCTRLCHUNKS);

			SCTP_INC_STATS(sock_net(asoc->base.sk), SCTP_MIB_INCTRLCHUNKS);



		if (chunk->transport)

			chunk->transport->last_time_heard = jiffies;

net/sctp/chunk.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ struct sctp_datamsg *sctp_datamsg_from_user(struct sctp_association *asoc, 
	offset = 0;



	if ((whole > 1) || (whole && over))

		SCTP_INC_STATS_USER(SCTP_MIB_FRAGUSRMSGS);

		SCTP_INC_STATS_USER(sock_net(asoc->base.sk), SCTP_MIB_FRAGUSRMSGS);



	/* Create chunks for all the full sized DATA chunks. */

	for (i=0, len=first_len; i < whole; i++) {

net/sctp/endpointola.c

+1 −1
Original line number Diff line number Diff line
@@ -478,7 +478,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work) 
		if (asoc && sctp_chunk_is_data(chunk))

			asoc->peer.last_data_from = chunk->transport;

		else

			SCTP_INC_STATS(SCTP_MIB_INCTRLCHUNKS);

			SCTP_INC_STATS(sock_net(ep->base.sk), SCTP_MIB_INCTRLCHUNKS);



		if (chunk->transport)

			chunk->transport->last_time_heard = jiffies;