diff options
Diffstat (limited to 'net/ipv4/ip_fragment.c')
| -rw-r--r-- | net/ipv4/ip_fragment.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c index 7f102eeb618e..be1cb89a8d5a 100644 --- a/net/ipv4/ip_fragment.c +++ b/net/ipv4/ip_fragment.c | |||
| @@ -624,6 +624,10 @@ static struct ctl_table ip4_frags_ns_ctl_table[] = { | |||
| 624 | .proc_handler = &proc_dointvec_jiffies, | 624 | .proc_handler = &proc_dointvec_jiffies, |
| 625 | .strategy = &sysctl_jiffies | 625 | .strategy = &sysctl_jiffies |
| 626 | }, | 626 | }, |
| 627 | { } | ||
| 628 | }; | ||
| 629 | |||
| 630 | static struct ctl_table ip4_frags_ctl_table[] = { | ||
| 627 | { | 631 | { |
| 628 | .ctl_name = NET_IPV4_IPFRAG_SECRET_INTERVAL, | 632 | .ctl_name = NET_IPV4_IPFRAG_SECRET_INTERVAL, |
| 629 | .procname = "ipfrag_secret_interval", | 633 | .procname = "ipfrag_secret_interval", |
| @@ -658,8 +662,6 @@ static int ip4_frags_ns_ctl_register(struct net *net) | |||
| 658 | table[0].data = &net->ipv4.frags.high_thresh; | 662 | table[0].data = &net->ipv4.frags.high_thresh; |
| 659 | table[1].data = &net->ipv4.frags.low_thresh; | 663 | table[1].data = &net->ipv4.frags.low_thresh; |
| 660 | table[2].data = &net->ipv4.frags.timeout; | 664 | table[2].data = &net->ipv4.frags.timeout; |
| 661 | table[3].mode &= ~0222; | ||
| 662 | table[4].mode &= ~0222; | ||
| 663 | } | 665 | } |
| 664 | 666 | ||
| 665 | hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table); | 667 | hdr = register_net_sysctl_table(net, net_ipv4_ctl_path, table); |
| @@ -684,6 +686,11 @@ static void ip4_frags_ns_ctl_unregister(struct net *net) | |||
| 684 | unregister_net_sysctl_table(net->ipv4.frags_hdr); | 686 | unregister_net_sysctl_table(net->ipv4.frags_hdr); |
| 685 | kfree(table); | 687 | kfree(table); |
| 686 | } | 688 | } |
| 689 | |||
| 690 | static void ip4_frags_ctl_register(void) | ||
| 691 | { | ||
| 692 | register_net_sysctl_rotable(net_ipv4_ctl_path, ip4_frags_ctl_table); | ||
| 693 | } | ||
| 687 | #else | 694 | #else |
| 688 | static inline int ip4_frags_ns_ctl_register(struct net *net) | 695 | static inline int ip4_frags_ns_ctl_register(struct net *net) |
| 689 | { | 696 | { |
| @@ -693,6 +700,10 @@ static inline int ip4_frags_ns_ctl_register(struct net *net) | |||
| 693 | static inline void ip4_frags_ns_ctl_unregister(struct net *net) | 700 | static inline void ip4_frags_ns_ctl_unregister(struct net *net) |
| 694 | { | 701 | { |
| 695 | } | 702 | } |
| 703 | |||
| 704 | static inline void ip4_frags_ctl_register(void) | ||
| 705 | { | ||
| 706 | } | ||
| 696 | #endif | 707 | #endif |
| 697 | 708 | ||
| 698 | static int ipv4_frags_init_net(struct net *net) | 709 | static int ipv4_frags_init_net(struct net *net) |
| @@ -730,6 +741,7 @@ static struct pernet_operations ip4_frags_ops = { | |||
| 730 | 741 | ||
| 731 | void __init ipfrag_init(void) | 742 | void __init ipfrag_init(void) |
| 732 | { | 743 | { |
| 744 | ip4_frags_ctl_register(); | ||
| 733 | register_pernet_subsys(&ip4_frags_ops); | 745 | register_pernet_subsys(&ip4_frags_ops); |
| 734 | ip4_frags.hashfn = ip4_hashfn; | 746 | ip4_frags.hashfn = ip4_hashfn; |
| 735 | ip4_frags.constructor = ip4_frag_init; | 747 | ip4_frags.constructor = ip4_frag_init; |
