Home » Mailing list archives » linux-netdev » 2010 » December » 10

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

Previous thread: [net-next-2.6 24/27] e1000e: minor error message corrections by Jeff Kirsher on Friday, December 10, 2010 - 3:06 am. (8 messages)

Next thread: [patch] isdn: return -EFAULT if copy_from_user() fails by Dan Carpenter on Friday, December 10, 2010 - 5:40 am. (6 messages)
[view original message]
From: Gerrit Renker
Subject: net-next-2.6 [Patch 1/1] dccp: dead code elimination
Date: Friday, December 10, 2010 - 4:59 am

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
--


[ message continues ]
[view original message]
From: Gerrit Renker
Subject: [PATCH 1/1] dccp: remove unused macros
Date: Friday, December 10, 2010 - 4:59 am

From: Shan Wei <shanwei@cn.fujitsu.com>

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

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Acked-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
---
 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
--


[ message continues ]
[view original message]
From: David Miller
Subject: Re: net-next-2.6 [Patch 1/1] dccp: dead code elimination
Date: Friday, December 10, 2010 - 12:23 pm

From: Gerrit Renker <gerrit@erg.abdn.ac.uk>

Pulled, thanks!
--


[ message continues ]
[view original message]
From: Shan Wei
Subject: Re: net-next-2.6 [Patch 1/1] dccp: dead code elimination
Date: Sunday, December 12, 2010 - 6:13 pm

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

-- 
Best Regards
-----
Shan Wei
--


[ message continues ]
Previous thread: [net-next-2.6 24/27] e1000e: minor error message corrections by Jeff Kirsher on Friday, December 10, 2010 - 3:06 am. (8 messages)

Next thread: [patch] isdn: return -EFAULT if copy_from_user() fails by Dan Carpenter on Friday, December 10, 2010 - 5:40 am. (6 messages)