GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-06-17 20:25:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[DCCP]: Tidy up unused structures

Browse source 
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>
This commit is contained in:
Gerrit Renker 2006-11-28 19:33:36 -02:00 • committed by David S. Miller
parent 78ad713da6
commit 5aed324369
3 changed files with 5 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/linux/dccp.h
View file

@ -200,7 +200,7 @@ struct dccp_so_feat {
}; };
/* DCCP socket options */ /* DCCP socket options */
#define DCCP_SOCKOPT_PACKET_SIZE 1 #define DCCP_SOCKOPT_PACKET_SIZE 1 /* XXX deprecated, without effect */
#define DCCP_SOCKOPT_SERVICE 2 #define DCCP_SOCKOPT_SERVICE 2
#define DCCP_SOCKOPT_CHANGE_L 3 #define DCCP_SOCKOPT_CHANGE_L 3
#define DCCP_SOCKOPT_CHANGE_R 4 #define DCCP_SOCKOPT_CHANGE_R 4
@ -460,7 +460,6 @@ struct dccp_ackvec;
* @dccps_service_list - second .. last service code on passive socket * @dccps_service_list - second .. last service code on passive socket
* @dccps_timestamp_time - time of latest TIMESTAMP option * @dccps_timestamp_time - time of latest TIMESTAMP option
* @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option * @dccps_timestamp_echo - latest timestamp received on a TIMESTAMP option
* @dccps_packet_size - Set thru setsockopt
* @dccps_l_ack_ratio - * @dccps_l_ack_ratio -
* @dccps_r_ack_ratio - * @dccps_r_ack_ratio -
* @dccps_pcslen - sender partial checksum coverage (via sockopt) * @dccps_pcslen - sender partial checksum coverage (via sockopt)
@ -495,7 +494,6 @@ struct dccp_sock {
struct dccp_service_list *dccps_service_list; struct dccp_service_list *dccps_service_list;
struct timeval dccps_timestamp_time; struct timeval dccps_timestamp_time;
__u32 dccps_timestamp_echo; __u32 dccps_timestamp_echo;
__u32 dccps_packet_size;
__u16 dccps_l_ack_ratio; __u16 dccps_l_ack_ratio;
__u16 dccps_r_ack_ratio; __u16 dccps_r_ack_ratio;
__u16 dccps_pcslen; __u16 dccps_pcslen;

4
net/dccp/ccids/ccid3.h
View file

@ -42,10 +42,6 @@
#include <linux/tfrc.h> #include <linux/tfrc.h>
#include "../ccid.h" #include "../ccid.h"
#define TFRC_MIN_PACKET_SIZE 16
#define TFRC_STD_PACKET_SIZE 256
#define TFRC_MAX_PACKET_SIZE 65535
/* Two seconds as per RFC 3448 4.2 */ /* Two seconds as per RFC 3448 4.2 */
#define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC) #define TFRC_INITIAL_TIMEOUT (2 * USEC_PER_SEC)

8
net/dccp/proto.c
View file

@ -470,7 +470,8 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
lock_sock(sk); lock_sock(sk);
switch (optname) { switch (optname) {
case DCCP_SOCKOPT_PACKET_SIZE: case DCCP_SOCKOPT_PACKET_SIZE:
dp->dccps_packet_size = val; DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
err = -EINVAL;
break; break;
case DCCP_SOCKOPT_CHANGE_L: case DCCP_SOCKOPT_CHANGE_L:
if (optlen != sizeof(struct dccp_so_feat)) if (optlen != sizeof(struct dccp_so_feat))
@ -581,9 +582,8 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
switch (optname) { switch (optname) {
case DCCP_SOCKOPT_PACKET_SIZE: case DCCP_SOCKOPT_PACKET_SIZE:
val = dp->dccps_packet_size; DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
len = sizeof(dp->dccps_packet_size); return -EINVAL;
break;
case DCCP_SOCKOPT_SERVICE: case DCCP_SOCKOPT_SERVICE:
return dccp_getsockopt_service(sk, len, return dccp_getsockopt_service(sk, len,
(__be32 __user *)optval, optlen); (__be32 __user *)optval, optlen);