← Back to branch summary

~ubuntu-branches/debian/experimental/linux-2.6/experimental

« back to all changes in this revision

Viewing changes to net/ipv4/tcp_ipv4.c

  • Committer: Package Import Robot
  • Author(s): Ben Hutchings, Ben Hutchings
  • Date: 2012-03-21 03:08:36 UTC
  • mfrom: (1.2.34)
  • Revision ID: package-import@ubuntu.com-20120321030836-rvavg03lkz15wj2q
Tags: 3.3-1~experimental.1
http://bugs.debian.org/663041
* New upstream release: http://kernelnewbies.org/Linux_3.3

[ Ben Hutchings ]
* [x86] crypto: Enable CRYPTO_SERPENT_SSE2_586, CRYPTO_SERPENT_SSE2_X86_64
* aufs: Update to aufs3.x-rcN-20120312
* IB: Enable INFINIBAND_SRPT as module (Closes: #663041)

Show diffs side-by-side

added added

removed removed

Lines of Context:
net/ipv4/tcp_ipv4.c
1466
1466
                inet_csk(newsk)->icsk_ext_hdr_len = inet_opt->opt.optlen;
1467
1467
        newinet->inet_id = newtp->write_seq ^ jiffies;
1468
1468
 
1469
 
        if (!dst && (dst = inet_csk_route_child_sock(sk, newsk, req)) == NULL)
1470
 
                goto put_and_exit;
1471
 
 
 
1469
        if (!dst) {
 
1470
                dst = inet_csk_route_child_sock(sk, newsk, req);
 
1471
                if (!dst)
 
1472
                        goto put_and_exit;
 
1473
        } else {
 
1474
                /* syncookie case : see end of cookie_v4_check() */
 
1475
        }
1472
1476
        sk_setup_caps(newsk, dst);
1473
1477
 
1474
1478
        tcp_mtup_init(newsk);