diff --git a/[refs] b/[refs] index 311161a541dd..a6b66e86439a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94dbffd540eea601aecad07e2df5bfd8a46672f3 +refs/heads/master: 8bb5f96b0c1f430e6be56edd6c7032bcedd86ff0 diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index 0bdfe2c71453..17caafe58247 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/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 */