diff options
| author |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-07-04 13:13:55 -0700 |
| commit | 404c3bc30cb1361e1b3533643326ab472d24a618 (patch) | |
| tree | 156cc9032c8aee17167d926c5bdae009ba8f36d2 /net/xfrm/xfrm_sysctl.c | |
| parent | Input: wacom - TPC2FG doesn't store touch id for slots (diff) | |
| parent | Linux 3.5-rc5 (diff) | |
| download | linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.tar.xz linux-dev-404c3bc30cb1361e1b3533643326ab472d24a618.zip | |
Merge commit 'v3.5-rc5' into next
Diffstat (limited to 'net/xfrm/xfrm_sysctl.c')
| -rw-r--r-- | net/xfrm/xfrm_sysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_sysctl.c b/net/xfrm/xfrm_sysctl.c index 05640bc9594b..380976f74c4c 100644 --- a/net/xfrm/xfrm_sysctl.c +++ b/net/xfrm/xfrm_sysctl.c @@ -54,7 +54,7 @@ int __net_init xfrm_sysctl_init(struct net *net) table[2].data = &net->xfrm.sysctl_larval_drop; table[3].data = &net->xfrm.sysctl_acq_expires; - net->xfrm.sysctl_hdr = register_net_sysctl_table(net, net_core_path, table); + net->xfrm.sysctl_hdr = register_net_sysctl(net, "net/core", table); if (!net->xfrm.sysctl_hdr) goto out_register; return 0; |