diff options
| author | David S. Miller <davem@davemloft.net> | 2010-12-10 11:22:57 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-12-10 11:22:57 -0800 |
| commit | eaa7dcde1d092c792cbca4be81d2e506e84c6122 (patch) | |
| tree | b3dfd579338ff07b09c4007849716be7f148c824 /net | |
| parent | cf78f8ee3de7d8d5b47d371c95716d0e4facf1c4 (diff) | |
| parent | b7ec19af63b467e30189984fb24e6157603608e3 (diff) | |
| download | op-kernel-dev-eaa7dcde1d092c792cbca4be81d2e506e84c6122.zip op-kernel-dev-eaa7dcde1d092c792cbca4be81d2e506e84c6122.tar.gz | |
Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6
Diffstat (limited to 'net')
| -rw-r--r-- | net/dccp/dccp.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 48ad5d9..4508705 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h @@ -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 |
