lkml.org 
[lkml]   [2009]   [Feb]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 22/48] ipv4: fix infinite retry loop in IP-Config
    2.6.28-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>

    [ Upstream commit 9d8dba6c979fa99c96938c869611b9a23b73efa9 ]

    Signed-off-by: Benjamin Zores <benjamin.zores@alcatel-lucent.fr>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    net/ipv4/ipconfig.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/net/ipv4/ipconfig.c
    +++ b/net/ipv4/ipconfig.c
    @@ -1272,6 +1272,9 @@ __be32 __init root_nfs_parse_addr(char *
    static int __init ip_auto_config(void)
    {
    __be32 addr;
    +#ifdef IPCONFIG_DYNAMIC
    + int retries = CONF_OPEN_RETRIES;
    +#endif

    #ifdef CONFIG_PROC_FS
    proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
    @@ -1308,9 +1311,6 @@ static int __init ip_auto_config(void)
    #endif
    ic_first_dev->next) {
    #ifdef IPCONFIG_DYNAMIC
    -
    - int retries = CONF_OPEN_RETRIES;
    -
    if (ic_dynamic() < 0) {
    ic_close_devs();



    \
     
     \ /
      Last update: 2009-02-14 02:39    [W:0.047 / U:61.380 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site