aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2006-11-28 16:33:36 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:30:59 -0500
commit5aed324369c94a2c38469c8288e42eb1a9fac400 (patch)
tree76290075540058745b53d34db1672f5e292e6b1a
parent78ad713da673a2977763521c347176137f3e493f (diff)
[DCCP]: Tidy up unused structures
This removes and cleans up unused variables and structures which have become unnecessary following the introduction of the EWMA patch to automatically track the CCID 3 receiver/sender packet sizes `s'. It deprecates the PACKET_SIZE socket option by returning an error code and printing a deprecation warning if an application tries to read or write this socket option. Signed-off-by: Gerrit Renker <gerrit@erg.abdn.ac.uk> Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
-rw-r--r--include/linux/dccp.h4
-rw-r--r--net/dccp/ccids/ccid3.h4
-rw-r--r--net/dccp/proto.c8
3 files changed, 5 insertions, 11 deletions
diff --git a/include/linux/dccp.h b/include/linux/dccp.h
index 72cc355d7a03..ed6cc8962d87 100644
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
@@ -200,7 +200,7 @@ struct dccp_so_feat {
200}; 200};
201 201
202/* DCCP socket options */ 202/* DCCP socket options */
203#define DCCP_SOCKOPT_PACKET_SIZE 1 203#define DCCP_SOCKOPT_PACKET_SIZE 1 /* XXX deprecated, without effect */
204#define DCCP_SOCKOPT_SERVICE 2 204#define DCCP_SOCKOPT_SERVICE 2
205#define DCCP_SOCKOPT_CHANGE_L 3 205#define DCCP_SOCKOPT_CHANGE_L 3
206#define DCCP_SOCKOPT_CHANGE_R 4 206#define DCCP_SOCKOPT_CHANGE_R 4
@@ -460,7 +460,6 @@ struct dccp_ackvec;
460 * @dccps_service_list - second .. last service code on passive socket 460 * @dccps_service_list - second .. last service code on passive socket
461 * @dccps_timestamp_time - time of latest TIMESTAMP option 461 * @dccps_timestamp_time - time of latest TIMESTAMP option
462 * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option 462 * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option
463 * @dccps_packet_size - Set thru setsockopt
464 * @dccps_l_ack_ratio - 463 * @dccps_l_ack_ratio -
465 * @dccps_r_ack_ratio - 464 * @dccps_r_ack_ratio -
466 * @dccps_pcslen - sender partial checksum coverage (via sockopt) 465 * @dccps_pcslen - sender partial checksum coverage (via sockopt)
@@ -495,7 +494,6 @@ struct dccp_sock {
495 struct dccp_service_list *dccps_service_list; 494 struct dccp_service_list *dccps_service_list;
496 struct timeval dccps_timestamp_time; 495 struct timeval dccps_timestamp_time;
497 __u32 dccps_timestamp_echo; 496 __u32 dccps_timestamp_echo;
498 __u32 dccps_packet_size;
499 __u16 dccps_l_ack_ratio; 497 __u16 dccps_l_ack_ratio;
500 __u16 dccps_r_ack_ratio; 498 __u16 dccps_r_ack_ratio;
501 __u16 dccps_pcslen; 499 __u16 dccps_pcslen;
diff --git a/net/dccp/ccids/ccid3.h b/net/dccp/ccids/ccid3.h
index 970921700ce3..dbb884426dfa 100644
--- a/net/dccp/ccids/ccid3.h
+++ b/net/dccp/ccids/ccid3.h
@@ -42,10 +42,6 @@
42#include <linux/tfrc.h> 42#include <linux/tfrc.h>
43#include "../ccid.h" 43#include "../ccid.h"
44 44
45#define TFRC_MIN_PACKET_SIZE 16
46#define TFRC_STD_PACKET_SIZE 256
47#define TFRC_MAX_PACKET_SIZE 65535
48
49/* Two seconds as per RFC 3448 4.2 */ 45/* Two seconds as per RFC 3448 4.2 */
50#define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC) 46#define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC)
51 47
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 3c44d502e5c1..2604e34d8f38 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -470,7 +470,8 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
470 lock_sock(sk); 470 lock_sock(sk);
471 switch (optname) { 471 switch (optname) {
472 case DCCP_SOCKOPT_PACKET_SIZE: 472 case DCCP_SOCKOPT_PACKET_SIZE:
473 dp->dccps_packet_size = val; 473 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
474 err = -EINVAL;
474 break; 475 break;
475 case DCCP_SOCKOPT_CHANGE_L: 476 case DCCP_SOCKOPT_CHANGE_L:
476 if (optlen != sizeof(struct dccp_so_feat)) 477 if (optlen != sizeof(struct dccp_so_feat))
@@ -581,9 +582,8 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
581 582
582 switch (optname) { 583 switch (optname) {
583 case DCCP_SOCKOPT_PACKET_SIZE: 584 case DCCP_SOCKOPT_PACKET_SIZE:
584 val = dp->dccps_packet_size; 585 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
585 len = sizeof(dp->dccps_packet_size); 586 return -EINVAL;
586 break;
587 case DCCP_SOCKOPT_SERVICE: 587 case DCCP_SOCKOPT_SERVICE:
588 return dccp_getsockopt_service(sk, len, 588 return dccp_getsockopt_service(sk, len,
589 (__be32 __user *)optval, optlen); 589 (__be32 __user *)optval, optlen);