From c557af0a45060e90362e011a9e443e67afaf0323 Mon Sep 17 00:00:00 2001 From: Andy Gospodarek Date: Mon, 29 Jan 2007 12:08:38 -0800 Subject: [PATCH] --- yaml --- r: 45955 b: refs/heads/master c: f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1 h: refs/heads/master i: 45953: 5f010f5d3f4dfe993b5db1c566cd2d229a8373f6 45951: 5a3763c478b9082b6eef355f2dd13fc59a6c8443 v: v3 --- [refs] | 2 +- trunk/drivers/net/bonding/bonding.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ea77498835f6..dcd83eaee2e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d4150a2731615de5cd4527a23435aaa7396c63c6 +refs/heads/master: f8a8ccd56d82bd4f4b5c7c2e7eb758c7764d98e1 diff --git a/trunk/drivers/net/bonding/bonding.h b/trunk/drivers/net/bonding/bonding.h index dc434fb6da85..0978c9ac6d2b 100644 --- a/trunk/drivers/net/bonding/bonding.h +++ b/trunk/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;