Merge branch 'dccp' of git://eden-feed.erg.abdn.ac.uk/net-next-2.6

3 files changed, 6 insertions, 3 deletions

diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h
index 45087052d894..5fdb07229017 100644
--- a/net/dccp/dccp.h
+++ b/net/dccp/dccp.h
@@ -426,7 +426,8 @@ static inline void dccp_update_gsr(struct sock *sk, u64 seq)
 {
         struct dccp_sock *dp = dccp_sk(sk);
 
-        dp->dccps_gsr = seq;
+        if (after48(seq, dp->dccps_gsr))
+                dp->dccps_gsr = seq;
         /* Sequence validity window depends on remote Sequence Window (7.5.1) */
         dp->dccps_swl = SUB48(ADD48(dp->dccps_gsr, 1), dp->dccps_r_seq_win / 4);
         /*
diff --git a/net/dccp/input.c b/net/dccp/input.c
index 15af247ea007..8cde009e8b85 100644
--- a/net/dccp/input.c
+++ b/net/dccp/input.c
@@ -260,7 +260,7 @@ static int dccp_check_seqno(struct sock *sk, struct sk_buff *skb)
                  */
                 if (time_before(now, (dp->dccps_rate_last +
                                       sysctl_dccp_sync_ratelimit)))
-                        return 0;
+                        return -1;
 
                 DCCP_WARN("Step 6 failed for %s packet, "
                           "(LSWL(%llu) <= P.seqno(%llu) <= S.SWH(%llu)) and "
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index 563943822e58..42348824ee31 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -21,7 +21,8 @@
 /* Boundary values */
 static int              zero     = 0,
                         u8_max   = 0xFF;
-static unsigned long    seqw_min = 32;
+static unsigned long    seqw_min = DCCPF_SEQ_WMIN,
+                        seqw_max = 0xFFFFFFFF;          /* maximum on 32 bit */
 
 static struct ctl_table dccp_default_table[] = {
         {
@@ -31,6 +32,7 @@ static struct ctl_table dccp_default_table[] = {
                 .mode           = 0644,
                 .proc_handler   = proc_doulongvec_minmax,
                 .extra1         = &seqw_min,            /* RFC 4340, 7.5.2 */
+                .extra2         = &seqw_max,
         },
         {
                 .procname       = "rx_ccid",