Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9566042e authored by Andi Kleen's avatar Andi Kleen Committed by David S. Miller
Browse files

IRDA: Fix global type conflicts in net/irda/irsysctl.c v2 



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: default avatarAndi Kleen <ak@linux.intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent aa1c366e

net/irda/irsysctl.c

+3 −3
Original line number Diff line number Diff line
@@ -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 int sysctl_min_tx_turn_time;

extern unsigned int sysctl_max_tx_data_size;

extern unsigned int sysctl_max_tx_window;

extern int  sysctl_max_noreply_time;

extern int  sysctl_warn_noreply_time;

extern int  sysctl_lap_keepalive_time;

net/irda/qos.c

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ int sysctl_max_noreply_time = 12; 
 * Default is 10us which means using the unmodified value given by the

 * peer except if it's 0 (0 is likely a bug in the other stack).

 */

unsigned sysctl_min_tx_turn_time = 10;

unsigned int sysctl_min_tx_turn_time = 10;

/*

 * Maximum data size to be used in transmission in payload of LAP frame.

 * There is a bit of confusion in the IrDA spec :
@@ -75,13 +75,13 @@ unsigned sysctl_min_tx_turn_time = 10; 
 * bytes frames or all negotiated frame sizes, but you can use the sysctl

 * to play with this value anyway.

 * Jean II */

unsigned sysctl_max_tx_data_size = 2042;

unsigned int sysctl_max_tx_data_size = 2042;

/*

 * Maximum transmit window, i.e. number of LAP frames between turn-around.

 * This allow to override what the peer told us. Some peers are buggy and

 * don't always support what they tell us.

 * Jean II */

unsigned sysctl_max_tx_window = 7;

unsigned int sysctl_max_tx_window = 7;



static int irlap_param_baud_rate(void *instance, irda_param_t *param, int get);

static int irlap_param_link_disconnect(void *instance, irda_param_t *parm,