2007-01-26 14:54:23

by Andy Gospodarek

Subject: [PATCH] bonding: ARP monitoring broken on x86_64

While working with the latest bonding code I noticed a nasty problem
that will prevent arp monitoring from always functioning correctly on
x86_64 systems. Comparing ints to longs and expecting reliable results
on x86_64 is a bad idea. With this patch, arp monitoring works correctly
again.

This also needs to make its way into the 2.6.19 stable series.

Signed-off-by: Andy Gospodarek <[email protected]>
---

bonding.h | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index dc434fb..cae0e59 100644
--- a/drivers/net/bonding/bonding.h
+++ b/drivers/net/bonding/bonding.h
@@ -151,8 +151,8 @@ struct slave {
struct slave *next;
struct slave *prev;
int delay;
- u32 jiffies;
- u32 last_arp_rx;
+ unsigned long jiffies;
+ unsigned long last_arp_rx;
s8 link; /* one of BOND_LINK_XXXX */
s8 state; /* one of BOND_STATE_XXXX */
u32 original_flags;
@@ -242,7 +242,7 @@ extern inline int slave_do_arp_validate(struct bonding *bond, struct slave *slav
return bond->params.arp_validate & (1 << slave->state);
}

-extern inline u32 slave_last_rx(struct bonding *bond, struct slave *slave)
+extern inline unsigned long slave_last_rx(struct bonding *bond, struct slave *slave)
{
if (slave_do_arp_validate(bond, slave))
return slave->last_arp_rx;

2007-01-26 21:59:54

by Jay Vosburgh

Subject: Re: [PATCH] bonding: ARP monitoring broken on x86_64

Andy Gospodarek <[email protected]> wrote:

>While working with the latest bonding code I noticed a nasty problem
>that will prevent arp monitoring from always functioning correctly on
>x86_64 systems. Comparing ints to longs and expecting reliable results
>on x86_64 is a bad idea. With this patch, arp monitoring works correctly
>again.
>
>This also needs to make its way into the 2.6.19 stable series.
>
>Signed-off-by: Andy Gospodarek <[email protected]>

Acked-by: Jay Vosburgh <[email protected]>

-J

---
-Jay Vosburgh, IBM Linux Technology Center, [email protected]