aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4
diff options
context:
space:
mode:
authorAndrew Morton <akpm@osdl.org>2006-11-30 22:16:28 -0500
committerDavid S. Miller <davem@sunset.davemloft.net>2006-12-03 00:31:52 -0500
commitb6332e6cf9c9198c0f3b0fe37c2c57514dafe1b8 (patch)
tree89eac69c7b6389f6ef55288239bcf41daac52a3e /net/ipv4
parentf5b99bcdddfb2338227faad3489c24907f37ee8e (diff)
[TCP]: Fix warnings with TCP_MD5SIG disabled.
Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
-rw-r--r--net/ipv4/tcp_ipv4.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index 7684297d80aa..a1222d6968c4 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -1233,11 +1233,11 @@ struct request_sock_ops tcp_request_sock_ops __read_mostly = {
1233 .send_reset = tcp_v4_send_reset, 1233 .send_reset = tcp_v4_send_reset,
1234}; 1234};
1235 1235
1236static struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {
1237#ifdef CONFIG_TCP_MD5SIG 1236#ifdef CONFIG_TCP_MD5SIG
1237static struct tcp_request_sock_ops tcp_request_sock_ipv4_ops = {
1238 .md5_lookup = tcp_v4_reqsk_md5_lookup, 1238 .md5_lookup = tcp_v4_reqsk_md5_lookup,
1239#endif
1240}; 1239};
1240#endif
1241 1241
1242static struct timewait_sock_ops tcp_timewait_sock_ops = { 1242static struct timewait_sock_ops tcp_timewait_sock_ops = {
1243 .twsk_obj_size = sizeof(struct tcp_timewait_sock), 1243 .twsk_obj_size = sizeof(struct tcp_timewait_sock),
@@ -1820,14 +1820,14 @@ struct inet_connection_sock_af_ops ipv4_specific = {
1820#endif 1820#endif
1821}; 1821};
1822 1822
1823static struct tcp_sock_af_ops tcp_sock_ipv4_specific = {
1824#ifdef CONFIG_TCP_MD5SIG 1823#ifdef CONFIG_TCP_MD5SIG
1824static struct tcp_sock_af_ops tcp_sock_ipv4_specific = {
1825 .md5_lookup = tcp_v4_md5_lookup, 1825 .md5_lookup = tcp_v4_md5_lookup,
1826 .calc_md5_hash = tcp_v4_calc_md5_hash, 1826 .calc_md5_hash = tcp_v4_calc_md5_hash,
1827 .md5_add = tcp_v4_md5_add_func, 1827 .md5_add = tcp_v4_md5_add_func,
1828 .md5_parse = tcp_v4_parse_md5_keys, 1828 .md5_parse = tcp_v4_parse_md5_keys,
1829#endif
1830}; 1829};
1830#endif
1831 1831
1832/* NOTE: A lot of things set to zero explicitly by call to 1832/* NOTE: A lot of things set to zero explicitly by call to
1833 * sk_alloc() so need not be done here. 1833 * sk_alloc() so need not be done here.