From f4e02090b3fd4ad24977e898ff9f72c56a7361ab Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Thu, 25 Dec 2008 16:56:45 -0800 Subject: [PATCH] --- yaml --- r: 122863 b: refs/heads/master c: ea686a2653c5586b1c7192958b9d521abde66e92 h: refs/heads/master i: 122861: d19af5897ca0411db3704ba8ba6ed7f2c14e7d76 122859: 9a528f2d7d44f478dcff7a1bb8d4ea46cf1835ab 122855: 1640bcc08db7ef52ae24f5ac82aa32c9c82e4226 122847: ea3d44ad39424f65cf74c24e0ab0e1251eb23f81 v: v3 --- [refs] | 2 +- trunk/net/sctp/socket.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 998314d338ce..b10c643a3e47 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e89c2095815d82eaa9fb85eff42f8b65b67a59cf +refs/heads/master: ea686a2653c5586b1c7192958b9d521abde66e92 diff --git a/trunk/net/sctp/socket.c b/trunk/net/sctp/socket.c index 0738843876a1..e432927310c9 100644 --- a/trunk/net/sctp/socket.c +++ b/trunk/net/sctp/socket.c @@ -2404,9 +2404,9 @@ static int sctp_setsockopt_delayed_ack(struct sock *sk, if (params.sack_delay == 0 && params.sack_freq == 0) return 0; } else if (optlen == sizeof(struct sctp_assoc_value)) { - printk(KERN_WARNING "SCTP: Use of struct sctp_sack_info " + printk(KERN_WARNING "SCTP: Use of struct sctp_assoc_value " "in delayed_ack socket option deprecated\n"); - printk(KERN_WARNING "SCTP: struct sctp_sack_info instead\n"); + printk(KERN_WARNING "SCTP: Use struct sctp_sack_info instead\n"); if (copy_from_user(¶ms, optval, optlen)) return -EFAULT; @@ -4221,9 +4221,9 @@ static int sctp_getsockopt_delayed_ack(struct sock *sk, int len, if (copy_from_user(¶ms, optval, len)) return -EFAULT; } else if (len == sizeof(struct sctp_assoc_value)) { - printk(KERN_WARNING "SCTP: Use of struct sctp_sack_info " + printk(KERN_WARNING "SCTP: Use of struct sctp_assoc_value " "in delayed_ack socket option deprecated\n"); - printk(KERN_WARNING "SCTP: struct sctp_sack_info instead\n"); + printk(KERN_WARNING "SCTP: Use struct sctp_sack_info instead\n"); if (copy_from_user(¶ms, optval, len)) return -EFAULT; } else