lkml.org 
[lkml]   [2011]   [Apr]   [30]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 54/69] sysctl: remove .child from net/llc tables
    Date
    Signed-off-by: Lucian Adrian Grijincu <lucian.grijincu@gmail.com>
    ---
    net/llc/sysctl_net_llc.c | 55 +++++++++++++++++++++++----------------------
    1 files changed, 28 insertions(+), 27 deletions(-)

    diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c
    index e2ebe35..8977307 100644
    --- a/net/llc/sysctl_net_llc.c
    +++ b/net/llc/sysctl_net_llc.c
    @@ -56,48 +56,49 @@ static struct ctl_table llc_station_table[] = {
    { },
    };

    -static struct ctl_table llc2_dir_timeout_table[] = {
    - {
    - .procname = "timeout",
    - .mode = 0555,
    - .child = llc2_timeout_table,
    - },
    - { },
    -};

    -static struct ctl_table llc_table[] = {
    - {
    - .procname = "llc2",
    - .mode = 0555,
    - .child = llc2_dir_timeout_table,
    - },
    - {
    - .procname = "station",
    - .mode = 0555,
    - .child = llc_station_table,
    - },
    - { },
    +static const __initdata struct ctl_path llc2_timeout_path[] = {
    + { .procname = "net", },
    + { .procname = "llc", },
    + { .procname = "llc2", },
    + { .procname = "timeout", },
    + { }
    };

    -static struct ctl_path llc_path[] = {
    +static const __initdata struct ctl_path llc_station_path[] = {
    { .procname = "net", },
    { .procname = "llc", },
    + { .procname = "station", },
    { }
    };

    -static struct ctl_table_header *llc_table_header;
    +static struct ctl_table_header *llc_station_hdr;
    +static struct ctl_table_header *llc2_timeout_hdr;

    int __init llc_sysctl_init(void)
    {
    - llc_table_header = register_sysctl_paths(llc_path, llc_table);
    + llc_station_hdr = register_sysctl_paths(llc_station_path, llc_station_table);
    + if (!llc_station_hdr)
    + return -ENOMEM;

    - return llc_table_header ? 0 : -ENOMEM;
    + llc2_timeout_hdr = register_sysctl_paths(llc2_timeout_path, llc2_timeout_table);
    + if (!llc2_timeout_hdr) {
    + unregister_sysctl_table(llc_station_hdr);
    + llc_station_hdr = NULL;
    + return -ENOMEM;
    + }
    +
    + return 0;
    }

    void llc_sysctl_exit(void)
    {
    - if (llc_table_header) {
    - unregister_sysctl_table(llc_table_header);
    - llc_table_header = NULL;
    + if (llc2_timeout_hdr) {
    + unregister_sysctl_table(llc2_timeout_hdr);
    + llc2_timeout_hdr = NULL;
    + }
    + if (llc_station_hdr) {
    + unregister_sysctl_table(llc_station_hdr);
    + llc_station_hdr = NULL;
    }
    }
    --
    1.7.5.134.g1c08b


    \
     
     \ /
      Last update: 2011-05-01 03:49    [W:0.035 / U:30.860 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site