diff --git a/[refs] b/[refs] index f4442a491d0b..90e6218e576e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b57c93dc3aa0115b589cb89ef862d46ab9bd95e +refs/heads/master: d2e4bdc8704b0e711c5046a430bfd1681b0bd5a9 diff --git a/trunk/net/ipv4/tcp_vegas.c b/trunk/net/ipv4/tcp_vegas.c index a3b7aa015a2f..ddc4bcc5785e 100644 --- a/trunk/net/ipv4/tcp_vegas.c +++ b/trunk/net/ipv4/tcp_vegas.c @@ -42,8 +42,8 @@ * with V_PARAM_SHIFT bits to the right of the binary point. */ #define V_PARAM_SHIFT 1 -static int alpha = 1<