git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ehea: Use round_jiffies_relative to align workqueue
[pandora-kernel.git]
/
drivers
/
net
/
ethernet
/
ibm
/
ehea
/
ehea_main.c
diff --git
a/drivers/net/ethernet/ibm/ehea/ehea_main.c
b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index
37b70f7
..
bfeccbf
100644
(file)
--- a/
drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/
drivers/net/ethernet/ibm/ehea/ehea_main.c
@@
-371,7
+371,8
@@
static void ehea_update_stats(struct work_struct *work)
out_herr:
free_page((unsigned long)cb2);
resched:
out_herr:
free_page((unsigned long)cb2);
resched:
- schedule_delayed_work(&port->stats_work, msecs_to_jiffies(1000));
+ schedule_delayed_work(&port->stats_work,
+ round_jiffies_relative(msecs_to_jiffies(1000)));
}
static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
}
static void ehea_refill_rq1(struct ehea_port_res *pr, int index, int nr_of_wqes)
@@
-2434,7
+2435,8
@@
static int ehea_open(struct net_device *dev)
}
mutex_unlock(&port->port_lock);
}
mutex_unlock(&port->port_lock);
- schedule_delayed_work(&port->stats_work, msecs_to_jiffies(1000));
+ schedule_delayed_work(&port->stats_work,
+ round_jiffies_relative(msecs_to_jiffies(1000)));
return ret;
}
return ret;
}