Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix imprecise timer interrupts by eliminating TSC clockevents frequency round...
[kvmfornfv.git]
/
kernel
/
net
/
bridge
/
br_sysfs_br.c
diff --git
a/kernel/net/bridge/br_sysfs_br.c
b/kernel/net/bridge/br_sysfs_br.c
index
4c97fc5
..
8365bd5
100644
(file)
--- a/
kernel/net/bridge/br_sysfs_br.c
+++ b/
kernel/net/bridge/br_sysfs_br.c
@@
-102,8
+102,15
@@
static ssize_t ageing_time_show(struct device *d,
static int set_ageing_time(struct net_bridge *br, unsigned long val)
{
static int set_ageing_time(struct net_bridge *br, unsigned long val)
{
- br->ageing_time = clock_t_to_jiffies(val);
- return 0;
+ int ret;
+
+ if (!rtnl_trylock())
+ return restart_syscall();
+
+ ret = br_set_ageing_time(br, val);
+ rtnl_unlock();
+
+ return ret;
}
static ssize_t ageing_time_store(struct device *d,
}
static ssize_t ageing_time_store(struct device *d,