tcp: Remove runtime check that can never be true.
authorDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2009 04:07:54 +0000 (20:07 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 9 Dec 2009 04:07:54 +0000 (20:07 -0800)
GCC even warns about it, as reported by Andrew Morton:

net/ipv4/tcp.c: In function 'do_tcp_getsockopt':
net/ipv4/tcp.c:2544: warning: comparison is always false due to limited range of data type

Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv4/tcp.c

index c8666b7..b0a26bb 100644 (file)
@@ -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;
 
                        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;
                        memcpy(&ctd.tcpct_value[0], &cvp->cookie_pair[0],
                               cvp->cookie_pair_size);
                        ctd.tcpct_used = cvp->cookie_pair_size;