aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@mandriva.com>2006-11-28 16:42:03 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:31:00 -0500
commit841bac1d607d8bf2e068e4b24393fb77372814e3 (patch)
treeae129257665491be24e088aed36b95d7aa4e0920
parent5aed324369c94a2c38469c8288e42eb1a9fac400 (diff)
[DCCP]: Make {set,get}sockopt(DCCP_SOCKOPT_PACKET_SIZE) return 0
To reflect the fact that this now is of no effect, not making apps stop working, just be warned in the system log. Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
-rw-r--r--net/dccp/proto.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c
index 2604e34d8f38..5ec47d9ee447 100644
--- a/net/dccp/proto.c
+++ b/net/dccp/proto.c
@@ -471,7 +471,7 @@ static int do_dccp_setsockopt(struct sock *sk, int level, int optname,
471 switch (optname) { 471 switch (optname) {
472 case DCCP_SOCKOPT_PACKET_SIZE: 472 case DCCP_SOCKOPT_PACKET_SIZE:
473 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n"); 473 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
474 err = -EINVAL; 474 err = 0;
475 break; 475 break;
476 case DCCP_SOCKOPT_CHANGE_L: 476 case DCCP_SOCKOPT_CHANGE_L:
477 if (optlen != sizeof(struct dccp_so_feat)) 477 if (optlen != sizeof(struct dccp_so_feat))
@@ -583,7 +583,7 @@ static int do_dccp_getsockopt(struct sock *sk, int level, int optname,
583 switch (optname) { 583 switch (optname) {
584 case DCCP_SOCKOPT_PACKET_SIZE: 584 case DCCP_SOCKOPT_PACKET_SIZE:
585 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n"); 585 DCCP_WARN("sockopt(PACKET_SIZE) is deprecated: fix your app\n");
586 return -EINVAL; 586 return 0;
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);