From: Arnaldo Carvalho de Melo <[EMAIL PROTECTED]>
Date: Fri, 21 Dec 2007 10:23:16 -0200

> Em Fri, Dec 21, 2007 at 06:56:17AM +0100, Eric Dumazet escreveu:
> > +static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock 
> > *sk)
> > +{
> > +   int mss;
> -       int mss;
>               
> > +
> > +   /* Black hole detection */
> > +   if (sysctl_tcp_mtu_probing) {
> > +           if (!icsk->icsk_mtup.enabled) {
> > +                   icsk->icsk_mtup.enabled = 1;
> > +                   tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
> > +           } else {
> > +                   struct tcp_sock *tp = tcp_sk(sk);
> +                     int mss;
> > +                   mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2;

I've checked in this, ummm... patch :-)

commit 323f3f2f31840f94e540ec5a0ce33593d05dd8d9
Author: David S. Miller <[EMAIL PROTECTED]>
Date:   Fri Dec 21 04:29:16 2007 -0800

    [TCP]: Move mss variable in tcp_mtu_probing()
    
    Down into the only scope where it is used.
    
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>

diff --git a/net/ipv4/tcp_timer.c b/net/ipv4/tcp_timer.c
index 8f14808..ea111e9 100644
--- a/net/ipv4/tcp_timer.c
+++ b/net/ipv4/tcp_timer.c
@@ -116,8 +116,6 @@ static int tcp_orphan_retries(struct sock *sk, int alive)
 
 static void tcp_mtu_probing(struct inet_connection_sock *icsk, struct sock *sk)
 {
-       int mss;
-
        /* Black hole detection */
        if (sysctl_tcp_mtu_probing) {
                if (!icsk->icsk_mtup.enabled) {
@@ -125,6 +123,8 @@ static void tcp_mtu_probing(struct inet_connection_sock 
*icsk, struct sock *sk)
                        tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
                } else {
                        struct tcp_sock *tp = tcp_sk(sk);
+                       int mss;
+
                        mss = tcp_mtu_to_mss(sk, icsk->icsk_mtup.search_low)/2;
                        mss = min(sysctl_tcp_base_mss, mss);
                        mss = max(mss, 68 - tp->tcp_header_len);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to