From 34dd7665d8acfb53f34134df3153bb297192a3f4 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Sun, 11 Jun 2006 21:20:38 -0700 Subject: [PATCH] --- yaml --- r: 27570 b: refs/heads/master c: bdeb04c6d9a957ae2a51c3033414467b82b2a736 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/net/ip.h | 1 - trunk/net/ipv4/sysctl_net_ipv4.c | 8 -------- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/[refs] b/[refs] index c3337972ff08..eab013308847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1e100ba69131bb788e89a07b94b08f6e006725a +refs/heads/master: bdeb04c6d9a957ae2a51c3033414467b82b2a736 diff --git a/trunk/include/net/ip.h b/trunk/include/net/ip.h index 3d2e5ca62a5a..ead233c9540d 100644 --- a/trunk/include/net/ip.h +++ b/trunk/include/net/ip.h @@ -147,7 +147,6 @@ void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *ar struct ipv4_config { int log_martians; - int autoconfig; int no_pmtu_disc; }; diff --git a/trunk/net/ipv4/sysctl_net_ipv4.c b/trunk/net/ipv4/sysctl_net_ipv4.c index 6a6aa537b7aa..e7fb665873c6 100644 --- a/trunk/net/ipv4/sysctl_net_ipv4.c +++ b/trunk/net/ipv4/sysctl_net_ipv4.c @@ -181,14 +181,6 @@ ctl_table ipv4_table[] = { .proc_handler = &ipv4_doint_and_flush, .strategy = &ipv4_doint_and_flush_strategy, }, - { - .ctl_name = NET_IPV4_AUTOCONFIG, - .procname = "ip_autoconfig", - .data = &ipv4_config.autoconfig, - .maxlen = sizeof(int), - .mode = 0644, - .proc_handler = &proc_dointvec - }, { .ctl_name = NET_IPV4_NO_PMTU_DISC, .procname = "ip_no_pmtu_disc",