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

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

Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6

parents cf78f8ee b7ec19af

net/dccp/dccp.h

+0 −8
Original line number Diff line number Diff line
@@ -93,9 +93,6 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo); 
#define DCCP_FALLBACK_RTT	(USEC_PER_SEC / 5)

#define DCCP_SANE_RTT_MAX	(3 * USEC_PER_SEC)



/* Maximal interval between probes for local resources.  */

#define DCCP_RESOURCE_PROBE_INTERVAL ((unsigned)(HZ / 2U))



/* sysctl variables for DCCP */

extern int  sysctl_dccp_request_retries;

extern int  sysctl_dccp_retries1;
@@ -203,12 +200,7 @@ struct dccp_mib { 
DECLARE_SNMP_STAT(struct dccp_mib, dccp_statistics);

#define DCCP_INC_STATS(field)	    SNMP_INC_STATS(dccp_statistics, field)

#define DCCP_INC_STATS_BH(field)    SNMP_INC_STATS_BH(dccp_statistics, field)

#define DCCP_INC_STATS_USER(field)  SNMP_INC_STATS_USER(dccp_statistics, field)

#define DCCP_DEC_STATS(field)	    SNMP_DEC_STATS(dccp_statistics, field)

#define DCCP_ADD_STATS_BH(field, val) \

			SNMP_ADD_STATS_BH(dccp_statistics, field, val)

#define DCCP_ADD_STATS_USER(field, val)	\

			SNMP_ADD_STATS_USER(dccp_statistics, field, val)



/*

 * 	Checksumming routines