diff options
author | Jay Vosburgh <fubar@us.ibm.com> | 2006-09-23 00:52:51 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-25 20:08:08 -0400 |
commit | 8bb5f96b0c1f430e6be56edd6c7032bcedd86ff0 (patch) | |
tree | fa30518bf610319d042236beb3a47eb092d43e4f /drivers/net | |
parent | 94dbffd540eea601aecad07e2df5bfd8a46672f3 (diff) |
[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 <k-iwami@cj.jp.nec.com>
Acked-by: Jay Vosburgh <fubar@us.ibm.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/bonding/bonding.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h index 0bdfe2c71453..17caafe58247 100644 --- a/drivers/net/bonding/bonding.h +++ b/drivers/net/bonding/bonding.h | |||
@@ -149,7 +149,7 @@ struct slave { | |||
149 | struct net_device *dev; /* first - useful for panic debug */ | 149 | struct net_device *dev; /* first - useful for panic debug */ |
150 | struct slave *next; | 150 | struct slave *next; |
151 | struct slave *prev; | 151 | struct slave *prev; |
152 | s16 delay; | 152 | int delay; |
153 | u32 jiffies; | 153 | u32 jiffies; |
154 | s8 link; /* one of BOND_LINK_XXXX */ | 154 | s8 link; /* one of BOND_LINK_XXXX */ |
155 | s8 state; /* one of BOND_STATE_XXXX */ | 155 | s8 state; /* one of BOND_STATE_XXXX */ |