lkml.org 
[lkml]   [2007]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 45/59] bonding: ARP monitoring broken on x86_64
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Andy Gospodarek <andy@greyhouse.net>

    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@greyhouse.net>
    Cc: "David S. Miller" <davem@davemloft.net>
    Cc: Stephen Hemminger <shemminger@osdl.org>
    Cc: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Andrew Morton <akpm@osdl.org>
    Signed-off-by: Jeff Garzik <jeff@garzik.org>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    drivers/net/bonding/bonding.h | 7 ++++---
    1 file changed, 4 insertions(+), 3 deletions(-)

    --- linux-2.6.19.2.orig/drivers/net/bonding/bonding.h
    +++ linux-2.6.19.2/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(
    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 linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-02-03 03:45    [W:0.021 / U:29.416 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site