From 8bb5f96b0c1f430e6be56edd6c7032bcedd86ff0 Mon Sep 17 00:00:00 2001 From: Jay Vosburgh Date: Fri, 22 Sep 2006 21:52:51 -0700 Subject: [PATCH] bonding: Convert delay value from s16 to int The value of "downdelay/miimon" and "updelay/miimon" are stored in slave->delay. The type of downdelay, updelay, and miimon are all int. However, slave->delay is type short, and it is not possible to store the value of "downdelay/miimon" or "updelay/miimon" in some cases. (For example, miimon=1 downdelay=32768) The attached patch fixes this problem. Signed-off-by: Kenzo Iwami Acked-by: Jay Vosburgh Signed-off-by: Jeff Garzik --- drivers/net/bonding/bonding.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers') diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 0bdfe2c7145..17caafe5824 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h @@ -149,7 +149,7 @@ struct slave { struct net_device *dev; /* first - useful for panic debug */ struct slave *next; struct slave *prev; - s16 delay; + int delay; u32 jiffies; s8 link; /* one of BOND_LINK_XXXX */ s8 state; /* one of BOND_STATE_XXXX */ -- cgit v1.2.3