aboutsummaryrefslogtreecommitdiff
path: root/net/dccp/proto.c
diff options
context:
space:
mode:
authorGerrit Renker <gerrit@erg.abdn.ac.uk>2006-11-28 19:33:36 -0200
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-02 21:30:59 -0800
commit5aed324369c94a2c38469c8288e42eb1a9fac400 (patch)
tree76290075540058745b53d34db1672f5e292e6b1a /net/dccp/proto.c
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>
Diffstat (limited to 'net/dccp/proto.c')
-rw-r--r--net/dccp/proto.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 3c44d502e5c..2604e34d8f3 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,
lock_sock(sk);
switch (optname) {
case DCCP_SOCKOPT_PACKET_SIZE:
- dp->dccps_packet_size = val;
+ DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
+ err = -EINVAL;
break;
case DCCP_SOCKOPT_CHANGE_L:
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) {
case DCCP_SOCKOPT_PACKET_SIZE:
- val = dp->dccps_packet_size;
- len = sizeof(dp->dccps_packet_size);
- break;
+ DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
+ return -EINVAL;
case DCCP_SOCKOPT_SERVICE:
return dccp_getsockopt_service(sk, len,
(__be32 __user *)optval, optlen);