lkml.org 
[lkml]   [2011]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/5] IRDA: Fix global type conflicts in net/irda/irsysctl.c
    Date
    From: Andi Kleen <ak@linux.intel.com>

    The externs here didn't agree with the declarations in qos.c.

    Better would be probably to move this into a header, but since it's
    common practice to have naked externs with sysctls I left it for now.

    Cc: samuel@sortiz.org
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    ---
    net/irda/irsysctl.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c
    index d0b70da..be22ad2 100644
    --- a/net/irda/irsysctl.c
    +++ b/net/irda/irsysctl.c
    @@ -40,9 +40,9 @@ extern int sysctl_slot_timeout;
    extern int sysctl_fast_poll_increase;
    extern char sysctl_devname[];
    extern int sysctl_max_baud_rate;
    -extern int sysctl_min_tx_turn_time;
    -extern int sysctl_max_tx_data_size;
    -extern int sysctl_max_tx_window;
    +extern unsigned sysctl_min_tx_turn_time;
    +extern unsigned sysctl_max_tx_data_size;
    +extern unsigned sysctl_max_tx_window;
    extern int sysctl_max_noreply_time;
    extern int sysctl_warn_noreply_time;
    extern int sysctl_lap_keepalive_time;
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-06-08 00:31    [W:0.020 / U:0.112 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site