diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /net/ipv4/devinet.c | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'net/ipv4/devinet.c')
| -rw-r--r-- | net/ipv4/devinet.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 3ffa60dadc0c..44fdf1413e2c 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c | |||
| @@ -1394,6 +1394,14 @@ static struct devinet_sysctl_table { | |||
| 1394 | .proc_handler = &proc_dointvec, | 1394 | .proc_handler = &proc_dointvec, |
| 1395 | }, | 1395 | }, |
| 1396 | { | 1396 | { |
| 1397 | .ctl_name = NET_IPV4_CONF_ARP_ACCEPT, | ||
| 1398 | .procname = "arp_accept", | ||
| 1399 | .data = &ipv4_devconf.arp_accept, | ||
| 1400 | .maxlen = sizeof(int), | ||
| 1401 | .mode = 0644, | ||
| 1402 | .proc_handler = &proc_dointvec, | ||
| 1403 | }, | ||
| 1404 | { | ||
| 1397 | .ctl_name = NET_IPV4_CONF_NOXFRM, | 1405 | .ctl_name = NET_IPV4_CONF_NOXFRM, |
| 1398 | .procname = "disable_xfrm", | 1406 | .procname = "disable_xfrm", |
| 1399 | .data = &ipv4_devconf.no_xfrm, | 1407 | .data = &ipv4_devconf.no_xfrm, |