Skip to contentSkip to conversation

dccp: remove never used macros

PATCH In review Shan Wei 3 participants 5 messages Dec 10, 2010 – Dec 13, 2010

Subsystems (2)
lore
Share & tools
lore

Shan Wei

author
#0 lore raw

PATCH 1/1 dccp: remove never used macros

Since 2005, the initial dccp implementation introduced these marcos, but never be used. So remove them.

commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c

Author: Arnaldo Carvalho de Melo <[email protected]>
Date:   Tue Aug 9 20:14:34 2005 -0700

[DCCP]: Initial implementation

---
 net/dccp/dccp.h |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
net/dccp/dccp.h +0 -8
index 48ad5d9..4508705 100644
@@ -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
Signature · 1 line
1.6.3.3
#1 lore raw

net-next-2.6 [Patch 1/1] dccp: dead code elimination

Dave,

can you please consider the attached patch - it removes indeed dead code. I have also placed this in into a fresh (today's) copy of net-next-2.6, on

    git://eden-feed.erg.abdn.ac.uk/net-next-2.6        [subtree 'dccp']

Shan,
I have edited the commit message (s/marcos/macros/). In future, please can you cc: your patches to netdev@vger also. Thank you.

Gerrit

#2 lore raw

PATCH 1/1 dccp: remove unused macros

From: Shan Wei <[email protected]>

Remove macros which have been unused since the initial implementation (commit 7c657876b63cb1d8a2ec06f8fc6c37bb8412e66c, [DCCP]: Initial
implementation from Tue Aug 9 20:14:34 2005 -0700).

---
 net/dccp/dccp.h |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)
net/dccp/dccp.h +0 -8
index 48ad5d9..4508705 100644
@@ -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
maintainer
#3 lore raw

Re: net-next-2.6 [Patch 1/1] dccp: dead code elimination

In reply to Gerrit Renker

From: Gerrit Renker <[email protected]>
Date: Fri, 10 Dec 2010 12:59:30 +0100

Quoted 6 lines

Dave,

can you please consider the attached patch - it removes indeed dead code. I have also placed this in into a fresh (today's) copy of net-next-2.6, on

    git://eden-feed.erg.abdn.ac.uk/net-next-2.6        [subtree 'dccp']

Pulled, thanks!

author
#4 lore raw

Re: net-next-2.6 [Patch 1/1] dccp: dead code elimination

In reply to Gerrit Renker

Gerrit Renker wrote, at 12/10/2010 07:59 PM:

Quoted 4 lines

Shan,
I have edited the commit message (s/marcos/macros/). In future, please can you cc: your patches to netdev@vger also. Thank you.

Thanks for your suggesting.
I'll do that next time.

Signature · 3 lines
Best Regards
-----
Shan Wei