diff options
| author | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2009-12-28 21:09:11 +0100 |
| commit | ea1e4b842049fcc4741096538114871a74859314 (patch) | |
| tree | c2336ab480ac0fd62e0dc41b391d99c97158dc9c /net/ipv4/tcp.c | |
| parent | ath9k: Fix TX poll routine (diff) | |
| parent | ps3_gelic_wireless: Fix build failure due to missing WEXT_PRIV (diff) | |
| download | linux-ea1e4b842049fcc4741096538114871a74859314.tar.xz linux-ea1e4b842049fcc4741096538114871a74859314.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net/ipv4/tcp.c')
| -rw-r--r-- | net/ipv4/tcp.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index c8666b70cde0..b0a26bb25e2e 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -2540,11 +2540,6 @@ static int do_tcp_getsockopt(struct sock *sk, int level, ctd.tcpct_cookie_desired = cvp->cookie_desired; ctd.tcpct_s_data_desired = cvp->s_data_desired; - /* Cookie(s) saved, return as nonce */ - if (sizeof(ctd.tcpct_value) < cvp->cookie_pair_size) { - /* impossible? */ - return -EINVAL; - } memcpy(&ctd.tcpct_value[0], &cvp->cookie_pair[0], cvp->cookie_pair_size); ctd.tcpct_used = cvp->cookie_pair_size; |