Commit:     f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1
Parent:     d4150a2731615de5cd4527a23435aaa7396c63c6
Author:     Andy Gospodarek <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 29 12:08:38 2007 -0800
Committer:  Jeff Garzik <[EMAIL PROTECTED]>
CommitDate: Tue Jan 30 09:36:02 2007 -0500

    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.
    Signed-off-by: Andy Gospodarek <[EMAIL PROTECTED]>
    Cc: "David S. Miller" <[EMAIL PROTECTED]>
    Cc: Stephen Hemminger <[EMAIL PROTECTED]>
    Cc: Jeff Garzik <[EMAIL PROTECTED]>
    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
 drivers/net/bonding/bonding.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/drivers/net/bonding/bonding.h b/drivers/net/bonding/bonding.h
index dc434fb..0978c9a 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,8 @@ 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;
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to