diff options
| author | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2009-02-03 10:19:23 -0500 |
| commit | e1f81c8a417be466e85a38b61679aa6860ec7331 (patch) | |
| tree | 749815f74bfad330e83560a10fd5da5fc4d8c765 /net/ipv6/addrconf.c | |
| parent | 0e2bedaa394f74fa9f75ee937488c33d90039b5a (diff) | |
| parent | b1792e367053968f2ddb48bc911d314143ce6242 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/ipv6/addrconf.c')
| -rw-r--r-- | net/ipv6/addrconf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/addrconf.c b/net/ipv6/addrconf.c index e92ad8455c63..f9afb452249c 100644 --- a/net/ipv6/addrconf.c +++ b/net/ipv6/addrconf.c | |||
| @@ -4250,7 +4250,7 @@ static struct addrconf_sysctl_table | |||
| 4250 | .procname = "mc_forwarding", | 4250 | .procname = "mc_forwarding", |
| 4251 | .data = &ipv6_devconf.mc_forwarding, | 4251 | .data = &ipv6_devconf.mc_forwarding, |
| 4252 | .maxlen = sizeof(int), | 4252 | .maxlen = sizeof(int), |
| 4253 | .mode = 0644, | 4253 | .mode = 0444, |
| 4254 | .proc_handler = proc_dointvec, | 4254 | .proc_handler = proc_dointvec, |
| 4255 | }, | 4255 | }, |
| 4256 | #endif | 4256 | #endif |