The patch titled
bonding: ARP monitoring broken on x86_64
has been removed from the -mm tree. Its filename was
bonding-arp-monitoring-broken-on-x86_64.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: bonding: ARP monitoring broken on x86_64
From: Andy Gospodarek <andy@xxxxxxxxxxxxx>
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.
Signed-off-by: Andy Gospodarek <andy@xxxxxxxxxxxxx>
Cc: "David S. Miller" <davem@xxxxxxxxxxxxx>
Cc: Stephen Hemminger <shemminger@xxxxxxxx>
Cc: Jeff Garzik <jeff@xxxxxxxxxx>
Acked-by: Jay Vosburgh <fubar@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/net/bonding/bonding.h | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff -puN drivers/net/bonding/bonding.h~bonding-arp-monitoring-broken-on-x86_64 drivers/net/bonding/bonding.h
--- a/drivers/net/bonding/bonding.h~bonding-arp-monitoring-broken-on-x86_64
+++ a/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;
@@ -243,7 +243,8 @@ static inline int slave_do_arp_validate(
return bond->params.arp_validate & (1 << slave->state);
}
-static inline u32 slave_last_rx(struct bonding *bond, struct slave *slave)
+static inline unsigned long slave_last_rx(struct bonding *bond,
+ struct slave *slave)
{
if (slave_do_arp_validate(bond, slave))
return slave->last_arp_rx;
_
Patches currently in -mm which might be from andy@xxxxxxxxxxxxx are
origin.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
