forked from Minki/linux
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
This commit is contained in:
commit
eaa7dcde1d
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user