projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'asoc-fix-v4.4-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/brooni...
[firefly-linux-kernel-4.4.55.git]
/
net
/
bridge
/
br_stp_if.c
diff --git
a/net/bridge/br_stp_if.c
b/net/bridge/br_stp_if.c
index 5396ff08af3215d1a532b853c8859fb64dfc6a1f..12045dea276c2ddae68f0d17ad0444eba02b8d02 100644
(file)
--- a/
net/bridge/br_stp_if.c
+++ b/
net/bridge/br_stp_if.c
@@
-39,7
+39,7
@@
void br_init_port(struct net_bridge_port *p)
struct switchdev_attr attr = {
.id = SWITCHDEV_ATTR_ID_BRIDGE_AGEING_TIME,
.flags = SWITCHDEV_F_SKIP_EOPNOTSUPP | SWITCHDEV_F_DEFER,
- .u.ageing_time =
p->br->ageing_time
,
+ .u.ageing_time =
jiffies_to_clock_t(p->br->ageing_time)
,
};
int err;