---

yaml
---
r: 6359
b: refs/heads/master
c: a10cedd
h: refs/heads/master
i:
  6357: 662084f
  6355: 4e498b2
  6351: 8774c65
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a1d3a35518779df0579dd9de0121354b49c68ddc
+refs/heads/master: a10cedd4b905236603c6c4fd77cf338ebbfb1a60

trunk/net/dccp/ccids/ccid3.c

@@ -1634,7 +1634,7 @@ static u32 ccid3_hc_rx_calc_first_li(struct sock *sk)
 	struct ccid3_hc_rx_sock *hcrx = dp->dccps_hc_rx_ccid_private;
 	struct dccp_rx_hist_entry *entry, *next, *tail = NULL;
 	u32 rtt, delta, x_recv, fval, p, tmp2;
-	struct timeval tstamp, tmp_tv;
+	struct timeval tstamp = { 0 }, tmp_tv;
 	int interval = 0;
 	int win_count = 0;
 	int step = 0;

trunk/net/dccp/dccp.h

@@ -60,20 +60,19 @@ extern void dccp_time_wait(struct sock *sk, int state, int timeo);
 extern struct proto dccp_v4_prot;
 
 /* is seq1 < seq2 ? */
-static inline const  int before48(const u64 seq1, const u64 seq2)
+static inline int before48(const u64 seq1, const u64 seq2)
 {
-	return (const s64)((seq1 << 16) - (seq2 << 16)) < 0;
+	return (s64)((seq1 << 16) - (seq2 << 16)) < 0;
 }
 
 /* is seq1 > seq2 ? */
-static inline const  int after48(const u64 seq1, const u64 seq2)
+static inline int after48(const u64 seq1, const u64 seq2)
 {
-	return (const s64)((seq2 << 16) - (seq1 << 16)) < 0;
+	return (s64)((seq2 << 16) - (seq1 << 16)) < 0;
 }
 
 /* is seq2 <= seq1 <= seq3 ? */
-static inline const int between48(const u64 seq1, const u64 seq2,
-				  const u64 seq3)
+static inline int between48(const u64 seq1, const u64 seq2, const u64 seq3)
 {
 	return (seq3 << 16) - (seq2 << 16) >= (seq1 << 16) - (seq2 << 16);
 }